This is an automated email from the ASF dual-hosted git repository.
zrhoffman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new b65e7a17d5 Updated build ATS to 9.2.4 (#7958)
b65e7a17d5 is described below
commit b65e7a17d57f4b86d36969f2574f4cdcacb648b0
Author: The Anh Nguyen <[email protected]>
AuthorDate: Wed Jul 10 10:30:35 2024 +0700
Updated build ATS to 9.2.4 (#7958)
* update branch, commit ats
* update ats tsb patches, branch
* fix: build astats_over_http plugin
* revert: check TS_VERSION_MAJOR
* Update astats_over_http.c
* Update astats_over_http.c
* chore: update CHANGELOG
* update build ats to 9.2.4
* chore: update Changelog
---
CHANGELOG.md | 1 +
traffic_server/_tsb/docker-compose.yml | 2 +-
traffic_server/_tsb/patches.yml | 13 +------------
traffic_server/_tsb/repos.yml | 8 +++-----
traffic_server/_tsb/trafficserver.spec | 12 ++++++++++--
5 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a698c6483d..023333a292 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
- [#7832](https://github.com/apache/trafficcontrol/pull/7832) *t3c* Removed
perl dependency
- Updated the CacheGroups Traffic Portal page to use a more performant
AG-Grid-based table.
- Updated Go version to 1.22.0
+- [#7958] Updated build ATS to 9.2.4
- [#7979](https://github.com/apache/trafficcontrol/pull/7979) *Traffic
Router*, *Traffic Monitor*, *Traffic Stats*: Store logs in /var/log
- [#7999](https://github.com/apache/trafficcontrol/pull/7999) *Traffic
Router*, *Traffic Monitor*, *Traffic Stats*: Symlink from
/opt/<component>/var/log to /var/log/<component>. These symlinks are deprecated
with the intent of removing them in ATC 9.0.0.
- [#7990](https://github.com/apache/trafficcontrol/pull/7990) *Traffic
Router*: Updated Apache Tomcat from 9.0.43, 9.0.67, 9.0.83, and 9.0.86 to
9.0.87.
diff --git a/traffic_server/_tsb/docker-compose.yml
b/traffic_server/_tsb/docker-compose.yml
index 6467a58bd6..36ded37ec9 100644
--- a/traffic_server/_tsb/docker-compose.yml
+++ b/traffic_server/_tsb/docker-compose.yml
@@ -31,5 +31,5 @@ services:
- ./src/cjose:/opt/src/cjose:Z
- ./src/openssl:/opt/src/openssl:Z
- ./src/ats:/rpmbuilddir/SOURCES/src:Z
- -
./src/trafficcontrol/traffic_server/plugins/astats_over_http:/opt/src/astats_over_http:Z
+ - ../plugins/astats_over_http:/opt/src/astats_over_http:Z
- ../../dist:/rpmbuilddir/RPMS/x86_64:Z
diff --git a/traffic_server/_tsb/patches.yml b/traffic_server/_tsb/patches.yml
index e6657a014d..582292b939 100644
--- a/traffic_server/_tsb/patches.yml
+++ b/traffic_server/_tsb/patches.yml
@@ -1,15 +1,4 @@
-ats:
- - f5ac00f3606bd826c52552e59f067d3fe3fcda33 #
<2018-09-11T17:18:30+00:[email protected]> For Nexthop, add the
capability to mark down origin servers utilizing traffic_ctl.
- - 721f8ffca6ee8782573084c671e45ce392d239ef #
<2018-06-21T17:21:58+00:[email protected]> add a reason tag to
traffic_control host subcommand.
- - d295784ba57af7e8e2dba09b85a1cbcaacf797f3 #
<2019-05-16T19:33:17+00:[email protected]> Add an ignore_self_detect flag
to parent.config so that the local cache host may be a member of a peering
cache group.
- - ef57a68f4f9d6f6dd5563cff82cddb8adcb8c28c #
<2020-05-16T00:05:44+00:[email protected]> forward port of slice
plugin from ats7
- - abe7a933e403b88f1b13ab7f2ebdd6ce95202b42 #
<2019-04-02T13:25:48+00:[email protected]> url_sig debug fix for when
url is missing the signature query string
- - 9ac557ba3c0f28979c996cb49a827940bfb569d8 #
<2019-09-30T19:04:12+00:[email protected]> url_sig: fix memory leak
with urlParse and pristine flag
- - 72e582d3de630008641e7849f7cd42b11f6f081b #
<2019-02-04T12:47:10-08:[email protected]> lua plugin: add support for
relative path scripts; moves inline script to switch
- - ad33e0fff0091093cd31fcfd429933299cb8bf5b #
<2020-02-07T00:44:14-08:[email protected]> Fix for lua plugin coredump
problem during reload
- - 1f13f346ef9ae4c0035f5755af4fd28b6f84f1e0 #
<2020-04-20T14:59:44-06:[email protected]> code and documentation for
lua states configuration and stats printing (#6571)
- - fc66eea820c8ba44196f2051aa41aedd7b874b0b #
<2020-03-16T19:30:54+00:[email protected]> Fixes a bug where
getHostStatus() will create a host status record when none is found. A Host
status record should only be created when a host is marked up or down when
traffic_ctl is used to mark a host up or down.
- - 5b38fb26737b38267615102775d81136a843075c #
<2020-07-01T13:59:15+00:[email protected]> CacheRead: clear dir entry
if doc is found to be truncated
+ats: []
openssl:
- ec6788fb8ca0704b503c3a0030a142d9805895a6 #
<2018-09-18T17:45:39+01:[email protected]> Delay setting the sig algs until
after the cert_cb has been called
trafficcontrol: []
diff --git a/traffic_server/_tsb/repos.yml b/traffic_server/_tsb/repos.yml
index 1532f2df64..630af8ea11 100644
--- a/traffic_server/_tsb/repos.yml
+++ b/traffic_server/_tsb/repos.yml
@@ -1,10 +1,8 @@
ats:
src: https://github.com/apache/trafficserver
- branch: 8.0.x
- head: a29528dffb8ea1c6fa57fe0c76ca1ec9d0f08694
- extra:
- - https://github.com/jrushford/trafficserver
- - https://github.com/traeak/trafficserver
+ branch: 9.2.x
+ head: 90fbf13db0858cef0e0a094f445d846b60a4c1ef # 9.2.4
+ extra: []
cjose:
src: https://github.com/cisco/cjose
branch: master
diff --git a/traffic_server/_tsb/trafficserver.spec
b/traffic_server/_tsb/trafficserver.spec
index 9d27aba5c4..8bf7f28aa8 100644
--- a/traffic_server/_tsb/trafficserver.spec
+++ b/traffic_server/_tsb/trafficserver.spec
@@ -136,7 +136,6 @@ fi
/opt/trafficserver/etc/trafficserver/trafficserver-release
%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/cache.config
%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/hosting.config
-%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/ip_allow.config
%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/logging.yaml
%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/parent.config
%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/plugin.config
@@ -145,11 +144,20 @@ fi
%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/socks.config
%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/splitdns.config
%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/ssl_multicert.config
-%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/ssl_server_name.yaml
%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/storage.config
%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/volume.config
+%if "%{tag}" >= "9"
+%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/ip_allow.yaml
+%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/sni.yaml
+%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/strategies.yaml
+%else
+%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/ip_allow.config
+%config(noreplace) %attr(644,ats,ats)
/opt/trafficserver/etc/trafficserver/ssl_server_name.yaml
+%endif
%changelog
+* Thu Mar 7 2024 The Anh Nguyen <ntheanh201(at)gmail.com>
+- Modified to support ATS 9.2.x
* Wed Mar 10 2021 Jonathan Gray <jhg03a(at)apache.org>
- Modified to support stop bundling openssl with ats
* Wed Aug 26 2020 Chris Lemmons <alficles(at)gmail.com>
