Update to trafficserver release 6.2.0

* Update to trafficserver release 6.2.0

5 files changed, 57 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10ec29cccfdf..12de294e5940 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sat Feb 13 16:34:50 UTC 2016
 pkgbase = trafficserver
 	pkgdesc = Apache Traffic Server
-	pkgver = 6.1.1
+	pkgver = 6.2.0
 	pkgrel = 1
 	url = http://trafficserver.apache.org/
 	install = trafficserver.install
@@ -15,6 +13,9 @@ pkgbase = trafficserver
 	depends = hwloc
 	depends = curl
 	depends = libunwind
+	depends = pcre
+	depends = libxml2
+	depends = geoip
 	backup = etc/trafficserver/congestion.config
 	backup = etc/trafficserver/logs_xml.config
 	backup = etc/trafficserver/hosting.config
@@ -28,6 +29,7 @@ pkgbase = trafficserver
 	backup = etc/trafficserver/storage.config
 	backup = etc/trafficserver/volume.config
 	backup = etc/trafficserver/icp.config
+	backup = etc/trafficserver/metrics.config
 	backup = etc/trafficserver/remap.config
 	backup = etc/trafficserver/ssl_multicert.config
 	backup = etc/trafficserver/cache.config
@@ -58,17 +60,18 @@ pkgbase = trafficserver
 	backup = etc/trafficserver/body_factory/default/connect#hangup
 	backup = etc/trafficserver/body_factory/default/request#invalid_content_length
 	backup = etc/trafficserver/body_factory/default/congestion#retryAfter
-	backup = etc/trafficserver/body_factory/default/access#redirect_url
 	backup = etc/trafficserver/plugin.config
 	backup = etc/trafficserver/stats.config.xml
 	backup = etc/trafficserver/log_hosts.config
 	backup = etc/trafficserver/ip_allow.config
-	source = http://archive.apache.org/dist/trafficserver/trafficserver-6.1.1.tar.bz2
+	source = http://archive.apache.org/dist/trafficserver/trafficserver-6.2.0.tar.bz2
 	source = trafficserver.tmpfiles
 	source = trafficserver.service.in.patch
-	md5sums = b9292920a5b683d506446e373f2dd504
+	source = trafficserver.lib_perl_Makefile.in.patch
+	md5sums = 481ae0af77f575166bbe6f335e27d250
 	md5sums = 44b617f732eb1944a916f36cc393ab7b
-	md5sums = 74ba08091f580f8984eee8db0f7e4d27
+	md5sums = 1a72eaf2dc694a5a60d949c9f3130e80
+	md5sums = 257988017b81baa7706de7cf8d897f5b
 
 pkgname = trafficserver
 
diff --git a/PKGBUILD b/PKGBUILD
index a86f2cdf4041..fd45eb4bd0b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,25 @@
 # Contributor: David Roheim <david dot roheim at gmail dot com>
 
 pkgname='trafficserver'
-pkgver=6.1.1
+pkgver=6.2.0
 pkgrel=1
 pkgdesc="Apache Traffic Server"
 url="http://trafficserver.apache.org/"
 license=('Apache')
 arch=('i686' 'x86_64')
-depends=('tcl' 'hwloc' 'curl' 'libunwind')
+depends=('tcl' 'hwloc' 'curl' 'libunwind' 'pcre' 'libxml2' 'geoip')
 makedepends=('flex')
 
 source=(
     http://archive.apache.org/dist/"${pkgname}"/"${pkgname}"-"${pkgver}".tar.bz2
     trafficserver.tmpfiles
-    trafficserver.service.in.patch)
+    trafficserver.service.in.patch
+    trafficserver.lib_perl_Makefile.in.patch)
 
-md5sums=('b9292920a5b683d506446e373f2dd504'
+md5sums=('481ae0af77f575166bbe6f335e27d250'
          '44b617f732eb1944a916f36cc393ab7b'
-         '74ba08091f580f8984eee8db0f7e4d27')
+         '1a72eaf2dc694a5a60d949c9f3130e80'
+         '257988017b81baa7706de7cf8d897f5b')
 
 install=${pkgname}.install
 changelog=${pkgname}.changelog
@@ -37,6 +39,7 @@ backup=(
     'etc/trafficserver/storage.config'
     'etc/trafficserver/volume.config'
     'etc/trafficserver/icp.config'
+    'etc/trafficserver/metrics.config'
     'etc/trafficserver/remap.config'
     'etc/trafficserver/ssl_multicert.config'
     'etc/trafficserver/cache.config'
@@ -67,7 +70,6 @@ backup=(
     'etc/trafficserver/body_factory/default/connect#hangup'
     'etc/trafficserver/body_factory/default/request#invalid_content_length'
     'etc/trafficserver/body_factory/default/congestion#retryAfter'
-    'etc/trafficserver/body_factory/default/access#redirect_url'
     'etc/trafficserver/plugin.config'
     'etc/trafficserver/stats.config.xml'
     'etc/trafficserver/log_hosts.config'
@@ -76,6 +78,7 @@ backup=(
 prepare() {
     cd "${srcdir}"/"${pkgname}-${pkgver}"
     patch -Np0 -u -i ../trafficserver.service.in.patch
+    patch -Np0 -u -i ../trafficserver.lib_perl_Makefile.in.patch
 }
 
 build() {
diff --git a/trafficserver.changelog b/trafficserver.changelog
index 6dd332498c65..65b578ccc3ad 100644
--- a/trafficserver.changelog
+++ b/trafficserver.changelog
@@ -1,3 +1,15 @@
+2016-08-17 Galen Sampson <youremail@domain.com>
+
+        * 6.2.0-1 :
+        Apache Traffic Server 6.2.0.
+
+
+2016-02-13 Galen Sampson <youremail@domain.com>
+
+        * 6.1.1-1 :
+        Apache Traffic Server 6.1.1.
+
+
 2016-01-31 Galen Sampson <youremail@domain.com>
 
         * 6.1.0-1 :
diff --git a/trafficserver.lib_perl_Makefile.in.patch b/trafficserver.lib_perl_Makefile.in.patch
new file mode 100644
index 000000000000..54ee458c3f7f
--- /dev/null
+++ b/trafficserver.lib_perl_Makefile.in.patch
@@ -0,0 +1,22 @@
+--- lib/perl/Makefile.in.orig	2016-08-17 08:10:18.804768153 -1000
++++ lib/perl/Makefile.in	2016-08-17 08:10:46.160746491 -1000
+@@ -708,16 +708,16 @@
+ 
+ 
+ all-local: Makefile-pl
+-	$(MAKE) -f Makefile-pl INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) DESTDIR=$(DESTDIR)
++	$(MAKE) -f Makefile-pl INSTALLDIRS=vendor
+ 
+ install-exec-local: Makefile-pl
+-	$(MAKE) -f Makefile-pl INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) DESTDIR=$(DESTDIR) install
++	$(MAKE) -f Makefile-pl INSTALLDIRS=vendor install
+ 
+ # The perl build needs to have the source files in the current working directory, so we need to
+ # copy them to the build directory if we are building out of tree.
+ Makefile-pl: Makefile.PL
+ 	test -f "$(top_builddir)/$(subdir)/Makefile.PL" || cp -rf "$(srcdir)/." "$(top_builddir)/$(subdir)/"
+-	$(PERL) Makefile.PL INSTALLDIRS=$(INSTALLDIRS) INSTALL_BASE=$(prefix) PREFIX=
++	$(PERL) Makefile.PL INSTALLDIRS=vendor
+ 
+ distclean-local:
+ 	-rm -rf Makefile-pl MYMETA.* blip
diff --git a/trafficserver.service.in.patch b/trafficserver.service.in.patch
index 8a674b81c0d7..4ca75e958f45 100644
--- a/trafficserver.service.in.patch
+++ b/trafficserver.service.in.patch
@@ -1,6 +1,6 @@
---- rc/trafficserver.service.in.orig	2013-03-16 14:11:06.317750280 -0700
-+++ rc/trafficserver.service.in	2013-03-16 14:12:18.471699935 -0700
-@@ -4,7 +4,7 @@
+--- rc/trafficserver.service.in.orig	2016-08-17 07:55:35.673822545 -1000
++++ rc/trafficserver.service.in	2016-08-17 07:56:10.830103516 -1000
+@@ -21,7 +21,7 @@
  
  [Service]
  Type=simple
@@ -8,4 +8,4 @@
 +EnvironmentFile=-/etc/conf.d/trafficserver
  PIDFile=@exp_runtimedir@/cop.pid
  ExecStart=@exp_bindir@/traffic_cop $TC_DAEMON_ARGS
- ExecReload=@exp_bindir@/traffic_line -x
+ ExecReload=@exp_bindir@/traffic_ctl config reload