Update to trafficserver release 9.0.2

* Update to trafficserver release 9.0.2
  - Add new perl and brotli compression dependency
  - Add a patch to allow a unit test that read /etc/hosts and assumed it
    contained `localhost` to pass.  This is done by providing a file to
    read in the tests directory.
  - Remove tcl dependency
  - Use python3 sphinx

6 files changed, 64 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50d02bad6b05..e91231940390 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = trafficserver
 	pkgdesc = Apache Traffic Server
-	pkgver = 8.0.7
+	pkgver = 9.0.2
 	pkgrel = 1
 	url = http://trafficserver.apache.org/
 	install = trafficserver.install
@@ -9,14 +9,15 @@ pkgbase = trafficserver
 	arch = x86_64
 	license = Apache
 	makedepends = flex
-	makedepends = python2-sphinx
-	depends = tcl
+	makedepends = python-sphinx
 	depends = hwloc
 	depends = curl
 	depends = libunwind
 	depends = pcre
 	depends = geoip
 	depends = luajit
+	depends = perl
+	depends = brotli
 	backup = etc/trafficserver/hosting.config
 	backup = etc/trafficserver/parent.config
 	backup = etc/trafficserver/records.config
@@ -24,10 +25,11 @@ pkgbase = trafficserver
 	backup = etc/trafficserver/trafficserver-release
 	backup = etc/trafficserver/splitdns.config
 	backup = etc/trafficserver/storage.config
-	backup = etc/trafficserver/ssl_server_name.yaml
+	backup = etc/trafficserver/sni.yaml
 	backup = etc/trafficserver/volume.config
 	backup = etc/trafficserver/remap.config
 	backup = etc/trafficserver/ssl_multicert.config
+	backup = etc/trafficserver/strategies.yaml
 	backup = etc/trafficserver/cache.config
 	backup = etc/trafficserver/body_factory/default/access#ssl_forbidden
 	backup = etc/trafficserver/body_factory/default/transcoding#unsupported
@@ -50,6 +52,7 @@ pkgbase = trafficserver
 	backup = etc/trafficserver/body_factory/default/request#no_content_length
 	backup = etc/trafficserver/body_factory/default/request#cycle_detected
 	backup = etc/trafficserver/body_factory/default/access#proxy_auth_required
+	backup = etc/trafficserver/body_factory/default/request#uri_len_too_long
 	backup = etc/trafficserver/body_factory/default/.body_factory_info
 	backup = etc/trafficserver/body_factory/default/urlrouting#no_mapping
 	backup = etc/trafficserver/body_factory/default/request#no_host
@@ -57,17 +60,18 @@ pkgbase = trafficserver
 	backup = etc/trafficserver/body_factory/default/request#invalid_content_length
 	backup = etc/trafficserver/plugin.config
 	backup = etc/trafficserver/logging.yaml
-	backup = etc/trafficserver/ip_allow.config
-	source = http://archive.apache.org/dist/trafficserver/trafficserver-8.0.7.tar.bz2
+	backup = etc/trafficserver/ip_allow.yaml
+	source = http://archive.apache.org/dist/trafficserver/trafficserver-9.0.2.tar.bz2
 	source = trafficserver.tmpfiles
 	source = trafficserver.sysusers
 	source = trafficserver.service.in.patch
 	source = trafficserver.lib_perl_Makefile.in.patch
-	md5sums = 1a2c1ee629785580b4da6b58c04e0411
-	md5sums = 5234ec78048900590edbf6d6e3be1af9
-	md5sums = a89c31b7753e8a9a0f83e7e0a79f5e87
-	md5sums = 89465888eb48237b68a3b1bd61eded53
-	md5sums = 719a9364900017cc05256042a51d0dc9
+	source = trafficserver.src_tscore_unit_tests.patch
+	sha256sums = ff475367aeef27eadefed1290d07241464edb27bccaea86d2a024b6b2b8e0564
+	sha256sums = 8c9dbabfe7a8e0ecf9f3edb3673d1ff0cd63bf79551389047a723479b8d21fac
+	sha256sums = a4e6a00dea61aa3f98413f092711afb90795ef35676f6a8e3970f4163d360202
+	sha256sums = fc0b437ef9f9c56ceaaa99eea7075abe15200ff540cfc505e42b0a8f762128b1
+	sha256sums = 6fb98a044637d6a6d7365b5e49e4a481f556b26d143898ab430e8e8dd7004277
+	sha256sums = cc56ee24659be4f81f0d70d3e4b0df0954e51647e77599baee4598d4c0339020
 
 pkgname = trafficserver
-
diff --git a/.gitignore b/.gitignore
index a69137762987..02ccb520950d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 src/
 pkg/
-trafficserver-*.pkg.tar.xz
+trafficserver-*.pkg.tar.*
 trafficserver-*.tar.bz2
 .*.swp
diff --git a/PKGBUILD b/PKGBUILD
index f928a7316c09..1fed13c95cd9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,29 @@
 # Contributor: David Roheim <david dot roheim at gmail dot com>
 
 pkgname='trafficserver'
-pkgver=8.0.7
+pkgver=9.0.2
 pkgrel=1
 pkgdesc="Apache Traffic Server"
 url="http://trafficserver.apache.org/"
 license=('Apache')
 arch=('i686' 'x86_64')
-depends=('tcl' 'hwloc' 'curl' 'libunwind' 'pcre' 'geoip' 'luajit')
-makedepends=('flex' 'python2-sphinx')
+depends=('hwloc' 'curl' 'libunwind' 'pcre' 'geoip' 'luajit' 'perl' 'brotli')
+makedepends=('flex' 'python-sphinx')
 
 source=(
     http://archive.apache.org/dist/"${pkgname}"/"${pkgname}"-"${pkgver}".tar.bz2
     trafficserver.tmpfiles
     trafficserver.sysusers
     trafficserver.service.in.patch
-    trafficserver.lib_perl_Makefile.in.patch)
+    trafficserver.lib_perl_Makefile.in.patch
+    trafficserver.src_tscore_unit_tests.patch)
 
-md5sums=('1a2c1ee629785580b4da6b58c04e0411'
-         '5234ec78048900590edbf6d6e3be1af9'
-         'a89c31b7753e8a9a0f83e7e0a79f5e87'
-         '89465888eb48237b68a3b1bd61eded53'
-         '719a9364900017cc05256042a51d0dc9')
+sha256sums=('ff475367aeef27eadefed1290d07241464edb27bccaea86d2a024b6b2b8e0564'
+            '8c9dbabfe7a8e0ecf9f3edb3673d1ff0cd63bf79551389047a723479b8d21fac'
+            'a4e6a00dea61aa3f98413f092711afb90795ef35676f6a8e3970f4163d360202'
+            'fc0b437ef9f9c56ceaaa99eea7075abe15200ff540cfc505e42b0a8f762128b1'
+            '6fb98a044637d6a6d7365b5e49e4a481f556b26d143898ab430e8e8dd7004277'
+            'cc56ee24659be4f81f0d70d3e4b0df0954e51647e77599baee4598d4c0339020')
 
 install=${pkgname}.install
 changelog=${pkgname}.changelog
@@ -58,10 +60,11 @@ backup=(
     'etc/trafficserver/trafficserver-release'
     'etc/trafficserver/splitdns.config'
     'etc/trafficserver/storage.config'
-    'etc/trafficserver/ssl_server_name.yaml'
+    'etc/trafficserver/sni.yaml'
     'etc/trafficserver/volume.config'
     'etc/trafficserver/remap.config'
     'etc/trafficserver/ssl_multicert.config'
+    'etc/trafficserver/strategies.yaml'
     'etc/trafficserver/cache.config'
     'etc/trafficserver/body_factory/default/access#ssl_forbidden'
     'etc/trafficserver/body_factory/default/transcoding#unsupported'
@@ -84,6 +87,7 @@ backup=(
     'etc/trafficserver/body_factory/default/request#no_content_length'
     'etc/trafficserver/body_factory/default/request#cycle_detected'
     'etc/trafficserver/body_factory/default/access#proxy_auth_required'
+    'etc/trafficserver/body_factory/default/request#uri_len_too_long'
     'etc/trafficserver/body_factory/default/.body_factory_info'
     'etc/trafficserver/body_factory/default/urlrouting#no_mapping'
     'etc/trafficserver/body_factory/default/request#no_host'
@@ -91,13 +95,14 @@ backup=(
     'etc/trafficserver/body_factory/default/request#invalid_content_length'
     'etc/trafficserver/plugin.config'
     'etc/trafficserver/logging.yaml'
-    'etc/trafficserver/ip_allow.config'
+    'etc/trafficserver/ip_allow.yaml'
 )
 
 prepare() {
     cd "${srcdir}"/"${pkgname}-${pkgver}"
     patch -Np0 -u -i ../trafficserver.service.in.patch
     patch -Np0 -u -i ../trafficserver.lib_perl_Makefile.in.patch
+    patch -Np0 -u -i ../trafficserver.src_tscore_unit_tests.patch
 }
 
 build() {
@@ -110,7 +115,7 @@ build() {
 
     cd "${srcdir}"/"${pkgname}-${pkgver}"
 
-    ./configure PYTHON=python2 SPHINXBUILD=sphinx-build2 \
+    ./configure SPHINXBUILD=sphinx-build \
         --with-user=trafficserver \
         --with-group=trafficserver \
         --enable-layout=Arch
diff --git a/trafficserver.changelog b/trafficserver.changelog
index 5deadb347ca4..6cfc74f8d820 100644
--- a/trafficserver.changelog
+++ b/trafficserver.changelog
@@ -1,3 +1,13 @@
+2021-07-15 Galen Sampson <youremail@domain.com>
+
+        * 9.0.2-1 :
+        Apache Traffic Server 9.0.2.
+
+        Use `python-sphinx` (python3) instead of `python2-sphinx` which used to
+        be required by the doc build in prior versions.
+
+
+
 2020-05-07 Galen Sampson <youremail@domain.com>
 
         * 8.0.7-1 :
diff --git a/trafficserver.install b/trafficserver.install
index 3f4fbc06ef53..bfd035fb06a0 100644
--- a/trafficserver.install
+++ b/trafficserver.install
@@ -26,10 +26,10 @@ pre_install() {
 
 post_upgrade() {
     # There are configuration changes required when upgrading to major
-    # version 8.
+    # version 9.
     if [[ "${2%%.*}" -lt 8 ]]; then
-        echo 'Please review your configuration when upgrading to v8:'
-        echo ' https://cwiki.apache.org/confluence/display/TS/Upgrading+to+v8.0'
+        echo 'Please review your configuration when upgrading to v9:'
+        echo ' https://docs.trafficserver.apache.org/en/9.0.x/release-notes/upgrading.en.html'
     fi
 }
 
diff --git a/trafficserver.src_tscore_unit_tests.patch b/trafficserver.src_tscore_unit_tests.patch
new file mode 100644
index 000000000000..2088d8ae9302
--- /dev/null
+++ b/trafficserver.src_tscore_unit_tests.patch
@@ -0,0 +1,17 @@
+diff -Naur src/tscore/unit_tests.orig/test_ts_file.cc src/tscore/unit_tests/test_ts_file.cc
+--- src/tscore/unit_tests.orig/test_ts_file.cc	2021-07-14 23:08:36.384215600 -0700
++++ src/tscore/unit_tests/test_ts_file.cc	2021-07-14 23:06:36.825609074 -0700
+@@ -48,7 +48,7 @@
+ 
+ TEST_CASE("ts_file_io", "[libts][ts_file_io]")
+ {
+-  path file("/etc/hosts");
++  path file("unit_tests/test_ts_file_load_positive.txt");
+   std::error_code ec;
+   std::string content = ts::file::load(file, ec);
+   REQUIRE(ec.value() == 0);
+diff -Naur src/tscore/unit_tests.orig/test_ts_file_load_positive.txt src/tscore/unit_tests/test_ts_file_load_positive.txt
+--- src/tscore/unit_tests.orig/test_ts_file_load_positive.txt	1969-12-31 16:00:00.000000000 -0800
++++ src/tscore/unit_tests/test_ts_file_load_positive.txt	2021-07-14 23:07:00.719328899 -0700
+@@ -0,0 +1 @@
++localhost