[rpms/trafficserver] f44: Merge branch 'rawhide' into f44

[rpms/trafficserver] f44: Merge branch 'rawhide' into f44

[Jered Floyd]

A new commit has been pushed.

Repo   : rpms/trafficserver
Branch : f44
Commit : 14e1be53316ec8fe3f7775d2bce2c1f38339c857
Author : Jered Floyd <jered@redhat.com>
Date   : 2026-08-13T01:32:08+00:00
Stats  : +15/-119 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/trafficserver/c/14e1be53316ec8fe3f7775d2bce2c1f38339c857?branch=f44

Log:
Merge branch 'rawhide' into f44

---
diff --git a/convert-ip-to-bind.patch b/convert-ip-to-bind.patch
deleted file mode 100644
index 99461f7..0000000
--- a/convert-ip-to-bind.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- tests/gold_tests/records/gold/renamed_records.gold
-+++ tests/gold_tests/records/gold/renamed_records.gold
-@@ -1,5 +1,5 @@
- ```
--┌■ 8 Renamed records:
-+┌■ 11 Renamed records:
- └┬──» #1 : proxy.config.output.logfile -> proxy.config.output.logfile.name
-  ├──» #2 : proxy.config.exec_thread.autoconfig -> proxy.config.exec_thread.autoconfig.enabled
-  ├──» #3 : proxy.config.hostdb -> proxy.config.hostdb.enabled
-@@ -7,5 +7,8 @@
-  ├──» #5 : proxy.config.ssl.origin_session_cache -> proxy.config.ssl.origin_session_cache.enabled
-  ├──» #6 : proxy.config.ssl.session_cache -> proxy.config.ssl.session_cache.mode
-  ├──» #7 : proxy.config.ssl.TLSv1_3 -> proxy.config.ssl.TLSv1_3.enabled
-- └──» #8 : proxy.config.ssl.client.TLSv1_3 -> proxy.config.ssl.client.TLSv1_3.enabled
-+ ├──» #8 : proxy.config.ssl.client.TLSv1_3 -> proxy.config.ssl.client.TLSv1_3.enabled
-+ ├──» #9 : proxy.local.incoming_ip_to_bind -> proxy.config.incoming_ip_to_bind
-+ ├──» #10 : proxy.local.outgoing_ip_to_bind -> proxy.config.outgoing_ip_to_bind
-+ └──» #11 : proxy.local.http.parent_proxy.disable_connect_tunneling -> proxy.config.http.parent_proxy.disable_connect_tunneling
- ```
---- tests/gold_tests/records/gold/renamed_records.yaml
-+++ tests/gold_tests/records/gold/renamed_records.yaml
-@@ -4,6 +4,11 @@ records:
-       enabled: 1
-   hostdb:
-     enabled: 1
-+  http:
-+    parent_proxy:
-+      disable_connect_tunneling: 0
-+  incoming_ip_to_bind: 0.0.0.0
-+  outgoing_ip_to_bind: 0.0.0.0
-   output:
-     logfile:
-       name: traffic.out
---- tests/gold_tests/records/legacy_config/old_records.config
-+++ tests/gold_tests/records/legacy_config/old_records.config
-@@ -7,3 +7,6 @@ CONFIG proxy.config.ssl.origin_session_cache INT 0
- CONFIG proxy.config.ssl.session_cache INT 0
- CONFIG proxy.config.ssl.TLSv1_3 INT 0
- CONFIG proxy.config.ssl.client.TLSv1_3 INT 0
-+CONFIG proxy.local.incoming_ip_to_bind STRING 0.0.0.0
-+CONFIG proxy.local.outgoing_ip_to_bind STRING 0.0.0.0
-+CONFIG proxy.local.http.parent_proxy.disable_connect_tunneling INT 0
---- tools/records/convert2yaml.py
-+++ tools/records/convert2yaml.py
-@@ -48,7 +48,10 @@
-     'proxy.config.ssl.origin_session_cache': 'proxy.config.ssl.origin_session_cache.enabled',
-     'proxy.config.ssl.session_cache': 'proxy.config.ssl.session_cache.mode',
-     'proxy.config.ssl.TLSv1_3': 'proxy.config.ssl.TLSv1_3.enabled',
--    'proxy.config.ssl.client.TLSv1_3': 'proxy.config.ssl.client.TLSv1_3.enabled'
-+    'proxy.config.ssl.client.TLSv1_3': 'proxy.config.ssl.client.TLSv1_3.enabled',
-+    'proxy.local.incoming_ip_to_bind': 'proxy.config.incoming_ip_to_bind',
-+    'proxy.local.outgoing_ip_to_bind': 'proxy.config.outgoing_ip_to_bind',
-+    'proxy.local.http.parent_proxy.disable_connect_tunneling': 'proxy.config.http.parent_proxy.disable_connect_tunneling'
- }
- 
- ###############################################################################################

diff --git a/remove-openssl-engine.patch b/remove-openssl-engine.patch
deleted file mode 100644
index 0361ee5..0000000
--- a/remove-openssl-engine.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/iocore/net/SSLUtils.cc	2025-01-09 22:39:31.823534630 +0000
-+++ src/iocore/net/SSLUtils.cc	2025-01-09 22:40:21.834084401 +0000
-@@ -65,7 +65,6 @@
- #include <openssl/conf.h>
- #include <openssl/dh.h>
- #include <openssl/ec.h>
--#include <openssl/engine.h>
- #include <openssl/err.h>
- #include <openssl/evp.h>
- #include <openssl/pem.h>
-@@ -866,16 +865,7 @@
- SSLPostConfigInitialize()
- {
-   if (SSLConfigParams::engine_conf_file) {
--#if HAVE_ENGINE_LOAD_DYNAMIC
--    ENGINE_load_dynamic();
--#endif
--
--    OPENSSL_load_builtin_modules();
--    if (CONF_modules_load_file(SSLConfigParams::engine_conf_file, nullptr, 0) <= 0) {
--      char err_buf[256] = {0};
--      ERR_error_string_n(ERR_get_error(), err_buf, sizeof(err_buf));
--      Error("Could not load SSL engine configuration file %s: %s", SSLConfigParams::engine_conf_file, err_buf);
--    }
-+    Error("OpenSSL engines no longer supported; please remove engine_conf_file.");
-   }
- }
- 

diff --git a/remove-rpath.patch b/remove-rpath.patch
deleted file mode 100644
index ade6e28..0000000
--- a/remove-rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- CMakeLists.txt	2024-11-15 23:55:31.179190618 +0000
-+++ CMakeLists.txt	2024-11-15 23:55:53.939278178 +0000
-@@ -588,10 +588,6 @@
-   set(THREADS_PREFER_PTHREAD_FLAG ON)
- endif()
- 
--# Set the rpath for installed binaries
--set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/lib64")
--set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--
- add_compile_definitions(${HOST_OS} PACKAGE_NAME="Apache Traffic Server" PACKAGE_VERSION="${TS_VERSION_STRING}")
- add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-invalid-offsetof>)
- 

diff --git a/sources b/sources
index 33ce490..7ae03d4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (trafficserver-10.1.4.tar.bz2) = 9c15fb5b8b4fdaf1e8d37266d6058cb8aeed127779586946e9b23d36e412b62d4604c256a47b8426d17a1b70a5113474f829a02ee41786b28469b45a58f7ca9a
-SHA512 (trafficserver-10.1.4.tar.bz2.asc) = fc4a819ce146159b29f5f1f5c9ddeadb6059eb9a4243743295d08b123052992bf439f04728e9425a244168acbd36614ee98515611ee75f20d41a54dca0d0eac4
+SHA512 (trafficserver-10.2.0.tar.bz2) = dc32cb6da0fc0b4eb4dc0ac7c1bb465eebc3fa27ff5c8611b686958b295a548492b336f0b4356d1848999ada2988d926c4538f678c68b0ba38cf3252bef72119
+SHA512 (trafficserver-10.2.0.tar.bz2.asc) = 4e3dad78bb57072100ddc4ef3744683173632f11ed974a198cc6ac1d1ff8afefcd4064e76c0b7679d181f7ef6fec1129892e4f2ac275702b4bcde4cef684bbab

diff --git a/trafficserver.spec b/trafficserver.spec
index 968d4f5..8b7dfd4 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -3,7 +3,7 @@
 %global selinuxtype targeted
 
 Name:           trafficserver
-Version:        10.1.4
+Version:        10.2.0
 Release:        1%{?dist}
 Summary:        Fast, scalable and extensible HTTP/1.1 and HTTP/2 caching proxy server
 
@@ -24,13 +24,11 @@ Source10:       %{name}-10-update.service
 # Use Crypto Policies, don't set rpath as per Fedora policy
 Patch0:         trafficserver-crypto-policy.patch
 Patch1:         fix-rpath.patch
-Patch2:         remove-openssl-engine.patch
-Patch3:         config-path-fix.patch
-Patch4:         convert-ip-to-bind.patch
+Patch2:         config-path-fix.patch
 
 # Upstream does not support 32-bit architectures:
 # https://github.com/apache/trafficserver/issues/4432
-# riscv64 and s390x are also not a supported architectures and do not build
+# riscv64 and s390x are also not supported architectures and do not build
 ExcludeArch:    %{arm} %{ix86} riscv64 s390x
 
 BuildRequires:  gdb
@@ -41,22 +39,12 @@ BuildRequires:  cmake
 BuildRequires:  libcap-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  openssl-devel
-# pcre is removed from RHEL 10
-%if 0%{?rhel} >= 10
-%else
-BuildRequires:  pcre-devel
-%endif
 BuildRequires:  yaml-cpp-devel
 
 Requires:       expat hwloc pcre2 xz ncurses pkgconfig
 Requires:       openssl
 Requires:       systemd
 Requires(postun): systemd
-# pcre is removed from RHEL 10
-%if 0%{?rhel} >= 10
-%else
-Requires:  pcre
-%endif
 # For convert2yaml.py
 Requires:       python3 python3-colorama python3-jsonschema python3-pyyaml
 
@@ -65,7 +53,7 @@ Requires:       (%{name}-selinux = %{version}-%{release} if selinux-policy-%{sel
 %endif
 
 # swoc is not separately packaged for Fedora -- literally nothing else uses this
-Provides:       bundled(swoc) =  1.5.12
+Provides:       bundled(swoc) =  1.5.15
 
 # Exclude our own internal libraries from requires
 %global __requires_exclude ^lib(swoc.*|ts.*)\\.so.*$
@@ -133,10 +121,6 @@ rm -r lib/yamlcpp
 
 # This is not working properly with cmake for an unclear reason; linking fails
 %define _lto_cflags %{nil}
-# GCC 16 is finding something maybe bad but impossible to debu
-%if 0%{?fedora} >= 44
-%define  _pkg_extra_cxxflags -Wno-error=maybe-uninitialized
-%endif
 
 %cmake \
     -DCMAKE_BUILD_TYPE=Release \
@@ -285,9 +269,15 @@ fi
 
 
 %changelog
+* Tue Aug 11 2026 Jered Floyd <jered@redhat.com> - 10.2.0-1
+- Update to upstream 10.2.0
+
 * Tue Jul 28 2026 Jered Floyd <jered@redhat.com> - 10.1.4-1
 - Update to upstream 10.1.4
 
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 10.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Wed Jul 15 2026 Jered Floyd <jered@redhat.com> - 10.1.3-1
 - Update to upstream 10.1.3
 

diff --git a/trafficserver.spec b/trafficserver.spec
index d710f79..8b7dfd4 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -272,6 +272,9 @@ fi
 * Tue Aug 11 2026 Jered Floyd <jered@redhat.com> - 10.2.0-1
 - Update to upstream 10.2.0
 
+* Tue Jul 28 2026 Jered Floyd <jered@redhat.com> - 10.1.4-1
+- Update to upstream 10.1.4
+
 * Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 10.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild