From 7c683d12081f6de27ebdf92a3a067d738f3f63f8 Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Tue, 30 Aug 2022 17:40:51 +0800
Subject: [PATCH] Fix traffic_layout remove core dumped
---
config-layout-openEuler.patch | 35 +++++++++++++++++++++++++++++++++++
trafficserver.spec | 25 ++++++++++++-------------
2 files changed, 47 insertions(+), 13 deletions(-)
create mode 100644 config-layout-openEuler.patch
diff --git a/config-layout-openEuler.patch b/config-layout-openEuler.patch
new file mode 100644
index 0000000..98d3107
--- /dev/null
+++ b/config-layout-openEuler.patch
@@ -0,0 +1,35 @@
+diff --git a/config.layout b/config.layout
+index da63e89..d46bfaf 100644
+--- a/config.layout
++++ b/config.layout
+@@ -219,6 +219,27 @@
+ cachedir: /var/cache+
+
+
++# openEuler Linux TrafficServer path layout.
++
++ prefix: /usr
++ exec_prefix: ${prefix}
++ bindir: ${exec_prefix}/bin
++ sbindir: ${exec_prefix}/sbin
++ libdir: ${exec_prefix}/lib64+
++ libexecdir: ${libdir}/plugins
++ infodir: ${prefix}/share/info
++ mandir: ${prefix}/share/man
++ sysconfdir: ${prefix}/etc+
++ datadir: ${prefix}/share+
++ docdir: ${prefix}/share/doc+
++ installbuilddir: ${datadir}/build
++ includedir: ${prefix}/include
++ localstatedir: ${prefix}/var+
++ runtimedir: ${localstatedir}/run
++ logdir: ${localstatedir}/log
++ cachedir: ${localstatedir}/cache
++
++
+ # OpenBSD path layout.
+
+ prefix: /usr/local
+--
+2.27.0
+
diff --git a/trafficserver.spec b/trafficserver.spec
index f9fd0a4..6ffd73b 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -1,7 +1,7 @@
%define _hardened_build 1
Name: trafficserver
Version: 9.1.3
-Release: 2
+Release: 3
Summary: Apache Traffic Server, a reverse, forward and transparent HTTP proxy cache
License: Apache-2.0
URL: https://trafficserver.apache.org/
@@ -9,6 +9,7 @@ Source0: http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.b
Patch0000: Add-openeuler-support.patch
Patch0001: Fix-status-failure-after-stopping-service.patch
Patch0002: Fix-log-in-debug-mode.patch
+Patch0003: config-layout-openEuler.patch
BuildRequires: expat-devel hwloc-devel openssl-devel pcre-devel zlib-devel xz-devel
BuildRequires: libcurl-devel ncurses-devel gcc gcc-c++ perl-ExtUtils-MakeMaker
BuildRequires: libcap-devel cmake libunwind-devel automake chrpath
@@ -36,14 +37,12 @@ This package contains some Perl APIs for talking to the ATS management port.
%build
autoreconf
-%configure \
- --enable-layout=Gentoo \
+./configure \
+ --enable-layout=openEuler \
--libdir=%{_libdir}/trafficserver \
--libexecdir=%{_libdir}/trafficserver/plugins \
- --sysconfdir=%{_sysconfdir}/trafficserver \
--enable-experimental-plugins \
--with-user=ats --with-group=ats \
- %{DISABLE_UNWIND} \
--disable-silent-rules
make %{?_smp_mflags} V=1
@@ -104,7 +103,7 @@ fi
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc README CHANGELOG* NOTICE STATUS
-%config(noreplace) /etc/trafficserver/*
+%config(noreplace) /usr/etc/trafficserver/*
%{_bindir}/traffic_*
%{_bindir}/tspush
%dir %{_libdir}/trafficserver
@@ -112,12 +111,9 @@ fi
%{_libdir}/trafficserver/libts*.so*
%{_libdir}/trafficserver/plugins/*.so
/lib/systemd/system/trafficserver.service
-%attr(0755, ats, ats) %dir /etc/trafficserver
-%attr(0755, ats, ats) %dir /var/log/trafficserver
-%attr(0755, ats, ats) %dir /run/trafficserver
-%attr(0755, ats, ats) %dir /var/cache/trafficserver
-%attr(0644, ats, ats) /etc/trafficserver/*.config
-%attr(0644, ats, ats) /etc/trafficserver/*.yaml
+%attr(0755, ats, ats) %dir /usr/etc/trafficserver
+%attr(0644, ats, ats) /usr/etc/trafficserver/*.config
+%attr(0644, ats, ats) /usr/etc/trafficserver/*.yaml
%config(noreplace) /etc/ld.so.conf.d/*
%files perl
@@ -133,10 +129,13 @@ fi
%{_datadir}/pkgconfig/trafficserver.pc
%changelog
+* Tue Aug 30 2022 wangkai - 9.1.3-3
+- Fix traffic_layout remove core dumped
+
* Thu Aug 25 2022 liyanan - 9.1.3-2
- fix rpath problem
-* Thu Aug 22 2022 panyanshuang - 9.1.3-1
+* Mon Aug 22 2022 panyanshuang - 9.1.3-1
- Upgrade to 9.1.3 to fix CVE-2022-31779
* Sat Jul 30 2022 Ge Wang - 9.1.2-2
--
Gitee