Update to trafficserver release 7.0.0

* Update to trafficserver release 7.0.0

4 files changed, 18 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index af37779304c6..59dbcf07e02a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 # Contributor: David Roheim <david dot roheim at gmail dot com>
 
 pkgname='trafficserver'
-pkgver=6.2.0
-pkgrel=2
+pkgver=7.0.0
+pkgrel=1
 pkgdesc="Apache Traffic Server"
 url="http://trafficserver.apache.org/"
 license=('Apache')
 arch=('i686' 'x86_64')
-depends=('tcl' 'hwloc' 'curl' 'libunwind' 'pcre' 'libxml2' 'geoip')
+depends=('tcl' 'hwloc' 'curl' 'libunwind' 'pcre' 'geoip')
 makedepends=('flex' 'python2-sphinx')
 
 source=(
@@ -17,17 +17,17 @@ source=(
     trafficserver.service.in.patch
     trafficserver.lib_perl_Makefile.in.patch)
 
-md5sums=('481ae0af77f575166bbe6f335e27d250'
+md5sums=('532f4b5213bff3c444e238bbb0e323a5'
          '44b617f732eb1944a916f36cc393ab7b'
          '1a72eaf2dc694a5a60d949c9f3130e80'
-         '257988017b81baa7706de7cf8d897f5b')
+         '21cb3150aac3f1609f933dea08904592')
 
 install=${pkgname}.install
 changelog=${pkgname}.changelog
 
 backup=(
     'etc/trafficserver/congestion.config'
-    'etc/trafficserver/logs_xml.config'
+    'etc/trafficserver/logging.config'
     'etc/trafficserver/hosting.config'
     'etc/trafficserver/parent.config'
     'etc/trafficserver/records.config'
@@ -38,7 +38,6 @@ backup=(
     'etc/trafficserver/cluster.config'
     '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'
@@ -71,7 +70,6 @@ backup=(
     'etc/trafficserver/body_factory/default/request#invalid_content_length'
     'etc/trafficserver/body_factory/default/congestion#retryAfter'
     'etc/trafficserver/plugin.config'
-    'etc/trafficserver/stats.config.xml'
     'etc/trafficserver/log_hosts.config'
     'etc/trafficserver/ip_allow.config')
 
diff --git a/trafficserver.changelog b/trafficserver.changelog
index 65b578ccc3ad..b10e122acd66 100644
--- a/trafficserver.changelog
+++ b/trafficserver.changelog
@@ -1,3 +1,9 @@
+2016-11-22 Galen Sampson <youremail@domain.com>
+
+        * 7.0.0-1 :
+        Apache Traffic Server 7.0.0.
+
+
 2016-08-17 Galen Sampson <youremail@domain.com>
 
         * 6.2.0-1 :
diff --git a/trafficserver.install b/trafficserver.install
index a15bc696189c..25ba2f9a4d5f 100644
--- a/trafficserver.install
+++ b/trafficserver.install
@@ -5,9 +5,9 @@ post_install() {
 post_upgrade() {
     # There are configuration changes required when upgrading to major
     # version 6.
-    if [[ "${2%%.*}" -lt 6 ]]; then
-        echo 'Please review your configuration when upgrading to v4:'
-        echo ' https://cwiki.apache.org/confluence/display/TS/Upgrading+to+v6.0'
+    if [[ "${2%%.*}" -lt 7 ]]; then
+        echo 'Please review your configuration when upgrading to v7:'
+        echo ' https://cwiki.apache.org/confluence/display/TS/Upgrading+to+v7.0'
     fi
 }
 
diff --git a/trafficserver.lib_perl_Makefile.in.patch b/trafficserver.lib_perl_Makefile.in.patch
index 54ee458c3f7f..14a646d095e5 100644
--- a/trafficserver.lib_perl_Makefile.in.patch
+++ b/trafficserver.lib_perl_Makefile.in.patch
@@ -1,5 +1,5 @@
---- 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
+--- lib/perl/Makefile.in.orig	2016-11-22 08:10:18.804768153 -1000
++++ lib/perl/Makefile.in	2016-11-22 08:10:46.160746491 -1000
 @@ -708,16 +708,16 @@
  
  
@@ -8,7 +8,7 @@
 +	$(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 INSTALLMAN3DIR=$(mandir)/man3 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