Update to trafficserver release 4.2.1

* Remove no longer necessary patch for automake makefiles.
* Remove now uncessary logic use to regenerate Makefiles with alocal and
  automake.  The Makefiles distributed with the .tar.bz2 file are
  sufficient.

4 files changed, 13 insertions, 82 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 316f3e0059e4..435976b0a111 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = trafficserver
 	pkgdesc = Apache Traffic Server
-	pkgver = 4.2.0
+	pkgver = 4.2.1
 	pkgrel = 1
 	url = http://trafficserver.apache.org/
 	install = trafficserver.install
@@ -59,14 +59,12 @@ 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-4.2.0.tar.bz2
+	source = http://archive.apache.org/dist/trafficserver/trafficserver-4.2.1.tar.bz2
 	source = trafficserver.tmpfiles
 	source = trafficserver.service.in.patch
-	source = trafficserver.e632b3a7d382008dcf27b35a05cbea0c691e834d.patch
-	md5sums = a4302d1650eac9bc7d4cab27985668d1
+	md5sums = 18f7d56650cba260c8cce3bf4abfa56c
 	md5sums = fc8ab2b6d01e22fb376832fb13137db1
 	md5sums = 74ba08091f580f8984eee8db0f7e4d27
-	md5sums = 9a5198d83d89b9f9d80dd360b8f26102
 
 pkgname = trafficserver
 
diff --git a/PKGBUILD b/PKGBUILD
index 552982bb4546..9e03c4ccaff4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: David Roheim <david dot roheim at gmail dot com>
 
 pkgname='trafficserver'
-pkgver=4.2.0
+pkgver=4.2.1
 pkgrel=1
 pkgdesc="Apache Traffic Server"
 url="http://trafficserver.apache.org/"
@@ -14,13 +14,11 @@ makedepends=('flex')
 source=(
     http://archive.apache.org/dist/"${pkgname}"/"${pkgname}"-"${pkgver}".tar.bz2
     trafficserver.tmpfiles
-    trafficserver.service.in.patch
-    trafficserver.e632b3a7d382008dcf27b35a05cbea0c691e834d.patch)
+    trafficserver.service.in.patch)
 
-md5sums=('a4302d1650eac9bc7d4cab27985668d1'
+md5sums=('18f7d56650cba260c8cce3bf4abfa56c'
          'fc8ab2b6d01e22fb376832fb13137db1'
-         '74ba08091f580f8984eee8db0f7e4d27'
-         '9a5198d83d89b9f9d80dd360b8f26102')
+         '74ba08091f580f8984eee8db0f7e4d27')
 
 install=${pkgname}.install
 changelog=${pkgname}.changelog
@@ -78,15 +76,6 @@ build() {
     cd "${pkgname}-${pkgver}"
     patch -Np0 -u -i ../trafficserver.service.in.patch
 
-    # There are link arguments missing to link against hwloc.  Patch the
-    # automake files with the addition of the appropriate libraries.
-    patch -Np1 -u -i \
-        ../trafficserver.e632b3a7d382008dcf27b35a05cbea0c691e834d.patch
-    # Since we have modified automake Makefiles we need to regenerate
-    # everything.
-    aclocal
-    automake
-
     ./configure --with-user=tserver --enable-layout=Arch
     make
 }
diff --git a/trafficserver.changelog b/trafficserver.changelog
index 3c3dddee5960..e810ee298dc9 100644
--- a/trafficserver.changelog
+++ b/trafficserver.changelog
@@ -1,3 +1,9 @@
+2014-05-22 Galen Sampson <youremail@domain.com>
+
+        * 4.2.1-1 :
+        Apache Traffic Server 4.2.1.
+
+
 2014-04-05 Galen Sampson <youremail@domain.com>
 
         * 4.2.0-1 :
diff --git a/trafficserver.e632b3a7d382008dcf27b35a05cbea0c691e834d.patch b/trafficserver.e632b3a7d382008dcf27b35a05cbea0c691e834d.patch
deleted file mode 100644
index 05677edafa59..000000000000
--- a/trafficserver.e632b3a7d382008dcf27b35a05cbea0c691e834d.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/iocore/aio/Makefile.am
-+++ b/iocore/aio/Makefile.am
-@@ -55,5 +55,4 @@ test_AIO_LDADD = \
-   $(top_builddir)/iocore/eventsystem/libinkevent.a \
-   $(top_builddir)/lib/ts/libtsutil.la \
-   $(top_builddir)/proxy/shared/libUglyLogStubs.a \
--  @LIBTCL@
--
-+  @LIBTCL@ @hwloc_LIBS@
---- a/iocore/eventsystem/Makefile.am
-+++ b/iocore/eventsystem/Makefile.am
-@@ -90,7 +90,7 @@ test_LDADD = \
-   $(top_builddir)/iocore/eventsystem/libinkevent.a \
-   $(top_builddir)/lib/ts/libtsutil.la \
-   $(top_builddir)/proxy/shared/libUglyLogStubs.a \
--  @LIBTCL@
-+  @LIBTCL@ @hwloc_LIBS@
- 
- test_Buffer_SOURCES = \
-   test_Buffer.cc
---- a/mgmt/Makefile.am
-+++ b/mgmt/Makefile.am
-@@ -103,7 +103,7 @@ traffic_manager_LDADD = \
-   $(top_builddir)/iocore/eventsystem/libinkevent.a \
-   $(top_builddir)/proxy/shared/liberror.a \
-   $(top_builddir)/proxy/shared/libdiagsconfig.a \
--  @LIBRESOLV@ @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ \
-+  @LIBRESOLV@ @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @hwloc_LIBS@ \
-   -lm
- 
- # Must do it this way or the dependencies aren't detected.
---- a/proxy/Makefile.am
-+++ b/proxy/Makefile.am
-@@ -176,7 +176,7 @@ traffic_logcat_LDADD = \
-   $(top_builddir)/lib/records/librecprocess.a \
-   $(top_builddir)/iocore/eventsystem/libinkevent.a \
-   $(top_builddir)/lib/ts/libtsutil.la \
--  @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ \
-+  @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @hwloc_LIBS@ \
-   @LIBEXPAT@ @LIBDEMANGLE@ @LIBPROFILER@ -lm
- 
- traffic_logstats_SOURCES = logstats.cc
-@@ -192,7 +192,7 @@ traffic_logstats_LDADD = \
-   $(top_builddir)/lib/records/librecprocess.a \
-   $(top_builddir)/iocore/eventsystem/libinkevent.a \
-   $(top_builddir)/lib/ts/libtsutil.la \
--  @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ \
-+  @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @hwloc_LIBS@ \
-   @LIBEXPAT@ @LIBDEMANGLE@ @LIBPROFILER@ -lm
- 
- traffic_sac_SOURCES = \
-@@ -246,7 +246,7 @@ traffic_sac_LDADD = \
-   $(top_builddir)/iocore/eventsystem/libinkevent.a \
-   $(top_builddir)/lib/records/librecprocess.a \
-   $(top_builddir)/lib/ts/libtsutil.la \
--  @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ \
-+  @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @hwloc_LIBS@ \
-   @LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ -lm
- 
- if BUILD_TESTS
--- 
-1.8.2.1