!28 Fix traffic_layout remove core dumped

From: @wk333 
Reviewed-by: @zengwefeng 
Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot 2022-08-31 09:35:19 +00:00 committed by Gitee
commit 69360a9a40
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 46 additions and 12 deletions

View File

@ -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+
</Layout>
+# openEuler Linux TrafficServer path layout.
+<Layout openEuler>
+ 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
+</Layout>
+
# OpenBSD path layout.
<Layout OpenBSD>
prefix: /usr/local
--
2.27.0

View File

@ -1,7 +1,7 @@
%define _hardened_build 1
Name: trafficserver
Version: 9.1.3
Release: 1
Release: 2
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
@ -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
@ -85,7 +84,7 @@ getent passwd ats >/dev/null || useradd -r -u 176 -g ats -d / -s /sbin/nologin -
%{!?_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
@ -93,12 +92,9 @@ getent passwd ats >/dev/null || useradd -r -u 176 -g ats -d / -s /sbin/nologin -
%{_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
%files perl
%defattr(-,root,root,-)
@ -113,6 +109,9 @@ getent passwd ats >/dev/null || useradd -r -u 176 -g ats -d / -s /sbin/nologin -
%{_datadir}/pkgconfig/trafficserver.pc
%changelog
* Tue Aug 30 2022 wangkai <wangkai385@h-partners.com> - 9.1.3-2
- Fix traffic_layout remove core dumped
* Mon Aug 22 2022 panyanshuang <panyanshuang@ncti-gba.cn> - 9.1.3-1
- Update to 9.1.3 to fix CVE-2022-31779