Update to trafficserver release 4.0.1

* The autoconf config.layout patch for Arch has been merged upstream as
  is no longer required.
* Output the upgrade instructions URL if we are upgrading from trafficserver
  3.x to 4.0 as some configuration changes might be required.

5 files changed, 29 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f06293bf6d8e..6176d7d0009e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = trafficserver
 	pkgdesc = Apache Traffic Server
-	pkgver = 3.2.5
+	pkgver = 4.0.1
 	pkgrel = 1
 	url = http://trafficserver.apache.org/
 	install = trafficserver.install
@@ -9,9 +9,9 @@ pkgbase = trafficserver
 	arch = x86_64
 	license = Apache
 	makedepends = flex
-	depends = openssl
 	depends = tcl
 	depends = hwloc
+	depends = curl
 	backup = etc/trafficserver/congestion.config
 	backup = etc/trafficserver/logs_xml.config
 	backup = etc/trafficserver/hosting.config
@@ -21,12 +21,9 @@ pkgbase = trafficserver
 	backup = etc/trafficserver/trafficserver-release
 	backup = etc/trafficserver/splitdns.config
 	backup = etc/trafficserver/vaddrs.config
-	backup = etc/trafficserver/ae_ua.config
 	backup = etc/trafficserver/cluster.config
 	backup = etc/trafficserver/storage.config
-	backup = etc/trafficserver/mgr.cnf
 	backup = etc/trafficserver/volume.config
-	backup = etc/trafficserver/plugin.db
 	backup = etc/trafficserver/icp.config
 	backup = etc/trafficserver/update.config
 	backup = etc/trafficserver/remap.config
@@ -62,13 +59,11 @@ pkgbase = trafficserver
 	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-3.2.5.tar.bz2
+	source = http://archive.apache.org/dist/trafficserver/trafficserver-4.0.1.tar.bz2
 	source = trafficserver.tmpfiles
-	source = config.layout.patch
 	source = trafficserver.service.in.patch
-	md5sums = bc76c68589389a453e4e4967c42636d6
+	md5sums = 9f68a20f0c1ae81c4ab41d6fc8810b35
 	md5sums = fc8ab2b6d01e22fb376832fb13137db1
-	md5sums = 9ca01c6833ebbde4644a255c8bf802ce
 	md5sums = 74ba08091f580f8984eee8db0f7e4d27
 
 pkgname = trafficserver
diff --git a/PKGBUILD b/PKGBUILD
index c6a20b26ede0..bc08fbeda8e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,23 @@
 # Contributor: David Roheim <david dot roheim at gmail dot com>
 
 pkgname=('trafficserver')
-pkgver=3.2.5
+pkgver=4.0.1
 pkgrel=1
 pkgdesc="Apache Traffic Server"
 url="http://trafficserver.apache.org/"
 license=('Apache')
 arch=('i686' 'x86_64')
-depends=('openssl' 'tcl' 'hwloc')
+depends=('tcl' 'hwloc' 'curl')
 makedepends=('flex')
 
 source=(
     http://archive.apache.org/dist/"${pkgname}"/"${pkgname}"-"${pkgver}".tar.bz2
     trafficserver.tmpfiles
-    config.layout.patch
     trafficserver.service.in.patch)
 
-md5sums=(bc76c68589389a453e4e4967c42636d6
-         fc8ab2b6d01e22fb376832fb13137db1
-         9ca01c6833ebbde4644a255c8bf802ce
-         74ba08091f580f8984eee8db0f7e4d27)
+md5sums=('9f68a20f0c1ae81c4ab41d6fc8810b35'
+         'fc8ab2b6d01e22fb376832fb13137db1'
+         '74ba08091f580f8984eee8db0f7e4d27')
 
 install=${pkgname}.install
 changelog=${pkgname}.changelog
@@ -35,12 +33,9 @@ backup=(
     'etc/trafficserver/trafficserver-release'
     'etc/trafficserver/splitdns.config'
     'etc/trafficserver/vaddrs.config'
-    'etc/trafficserver/ae_ua.config'
     'etc/trafficserver/cluster.config'
     'etc/trafficserver/storage.config'
-    'etc/trafficserver/mgr.cnf'
     'etc/trafficserver/volume.config'
-    'etc/trafficserver/plugin.db'
     'etc/trafficserver/icp.config'
     'etc/trafficserver/update.config'
     'etc/trafficserver/remap.config'
@@ -79,7 +74,6 @@ backup=(
 
 build() {
     cd "${pkgname}-${pkgver}"
-    patch -Np0 -u -i ../config.layout.patch
     patch -Np0 -u -i ../trafficserver.service.in.patch
     ./configure --with-user=tserver --enable-layout=Arch
     make
@@ -102,6 +96,11 @@ package()
     rm -f "${pkgdir}"/usr/lib/trafficserver/conf_remap.la
     rm -f "${pkgdir}"/usr/lib/trafficserver/stats_over_http.la
     rm -f "${pkgdir}"/usr/lib/trafficserver/header_filter.la
+    rm -f "${pkgdir}"/usr/lib/libatscpp11api.la
+    rm -f "${pkgdir}"/usr/lib/trafficserver/gzip.la
+    rm -f "${pkgdir}"/usr/lib/trafficserver/cacheurl.la
+    rm -f "${pkgdir}"/usr/lib/trafficserver/libloader.la
+    rm -f "${pkgdir}"/usr/lib/trafficserver/header_rewrite.la
 
     rm -rf "${pkgdir}"/run
 
diff --git a/config.layout.patch b/config.layout.patch
deleted file mode 100644
index 344385783902..000000000000
--- a/config.layout.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- config.layout.orig	2013-03-16 13:21:39.475213473 -0700
-+++ config.layout	2013-03-16 13:34:04.501781685 -0700
-@@ -257,3 +257,23 @@
-     logdir:        ${prefix}/logs+
-     cachedir:      ${datadir}
- </Layout>
-+
-+<Layout Arch>
-+    prefix:        /usr
-+    exec_prefix:   ${prefix}
-+    bindir:        ${exec_prefix}/bin
-+    sbindir:       ${exec_prefix}/sbin
-+    libdir:        ${exec_prefix}/lib
-+    libexecdir:    ${libdir}+
-+    infodir:       ${prefix}/share/info
-+    mandir:        ${prefix}/share/man
-+    sysconfdir:    /etc+
-+    datadir:       ${prefix}/share+
-+    docdir:        ${prefix}/share/doc+
-+    installbuilddir: ${datadir}/build
-+    includedir:    ${prefix}/include
-+    localstatedir: /run
-+    runtimedir:    /run+
-+    logdir:        /var/log+
-+    cachedir:      /var/lib+
-+</Layout>
diff --git a/trafficserver.changelog b/trafficserver.changelog
index 343fa4c8081f..8b394b709947 100644
--- a/trafficserver.changelog
+++ b/trafficserver.changelog
@@ -1,3 +1,9 @@
+2013-09-09 Galen Sampson <youremail@domain.com>
+
+        * 4.0.1-1 :
+        Apache Traffic Server 4.0.1.
+
+
 2013-07-29 Galen Sampson <youremail@domain.com>
 
         * 3.25-1 :
diff --git a/trafficserver.install b/trafficserver.install
index 3fe5491daac0..10da33b2f68d 100644
--- a/trafficserver.install
+++ b/trafficserver.install
@@ -4,6 +4,15 @@ pre_install() {
         -d /var/lib/trafficserver -g tserver -s /bin/false tserver >/dev/null
 }
 
+post_upgrade() {
+    # There are configuration changes required when upgrading to major
+    # version 4.
+    if [[ "${2%%.*}" -lt 4 ]]; then
+        echo 'Please review your configuration when upgrading to v4:'
+        echo ' https://cwiki.apache.org/confluence/display/TS/Upgrading+to+v4.0'
+    fi
+}
+
 post_remove() {
 	getent passwd tserver &>/dev/null && userdel  tserver  >/dev/null
 	getent group tserver  &>/dev/null && groupdel tserver  >/dev/null