From 743b748910df8335aa871bbaa93e21c7f5a79914 Mon Sep 17 00:00:00 2001
From: lingsheng <lingsheng@huawei.com>
Date: Fri, 12 Nov 2021 09:39:45 +0800
Subject: [PATCH] fix stop service fail and remove SysVinit script

(cherry picked from commit 9594157dbd986435c30bd6e29f813df6aaf029c3)
---
 ...tatus-failure-after-stopping-service.patch | 24 +++++++++++++++++++
 trafficserver.spec                            |  9 +++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 Fix-status-failure-after-stopping-service.patch

diff --git a/Fix-status-failure-after-stopping-service.patch b/Fix-status-failure-after-stopping-service.patch
new file mode 100644
index 0000000..11af30f
--- /dev/null
+++ b/Fix-status-failure-after-stopping-service.patch
@@ -0,0 +1,24 @@
+From 0e778106d6f88952c48966357411e16e8fa15a07 Mon Sep 17 00:00:00 2001
+From: lingsheng <lingsheng@huawei.com>
+Date: Thu, 11 Nov 2021 20:14:13 +0800
+Subject: [PATCH] Fix status failure after stopping service
+
+---
+ rc/trafficserver.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rc/trafficserver.service.in b/rc/trafficserver.service.in
+index 7aab848..0266825 100644
+--- a/rc/trafficserver.service.in
++++ b/rc/trafficserver.service.in
+@@ -33,6 +33,7 @@ ExecStopPost=/bin/sh -c ' \
+ TimeoutStopSec=5s
+ ExecReload=@exp_bindir@/traffic_ctl config reload
+ KillMode=process
++SuccessExitStatus=15
+ 
+ [Install]
+ WantedBy=multi-user.target
+-- 
+2.23.0
+
diff --git a/trafficserver.spec b/trafficserver.spec
index 6c36338..1a36b76 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -2,7 +2,7 @@
 %{!?release: %define release 2}
 Name:                trafficserver
 Version:             9.1.0
-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/
@@ -12,6 +12,7 @@ Patch0001:           CVE-2021-37147.patch
 Patch0002:           CVE-2021-37149.patch
 Patch0003:           CVE-2021-41585.patch
 Patch0004:           CVE-2021-43082.patch
+Patch0005:           Fix-status-failure-after-stopping-service.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
@@ -65,6 +66,7 @@ mv %{buildroot}/usr/lib/perl5/* %{buildroot}%{_datadir}/perl5
 mkdir -p %{buildroot}/run/trafficserver
 mkdir -p %{buildroot}%{_datadir}/pkgconfig
 mv %{buildroot}%{_libdir}/trafficserver/pkgconfig/trafficserver.pc %{buildroot}%{_datadir}/pkgconfig
+rm -f %{buildroot}%{_bindir}/trafficserver
 
 %post
 /sbin/ldconfig
@@ -87,7 +89,7 @@ getent passwd ats >/dev/null || useradd -r -u 176 -g ats -d / -s /sbin/nologin -
 %license LICENSE
 %doc README CHANGELOG* NOTICE STATUS
 %config(noreplace) /etc/trafficserver/*
-%{_bindir}/traffic*
+%{_bindir}/traffic_*
 %{_bindir}/tspush
 %dir %{_libdir}/trafficserver
 %dir %{_libdir}/trafficserver/plugins
@@ -114,6 +116,9 @@ getent passwd ats >/dev/null || useradd -r -u 176 -g ats -d / -s /sbin/nologin -
 %{_datadir}/pkgconfig/trafficserver.pc
 
 %changelog
+* Fri Nov 12 2021 lingsheng <lingsheng@huawei.com> - 9.1.0-3
+- fix stop service fail and remove SysVinit script
+
 * Mon Nov 08 2021 wangkai <wangkai385@huawei.com> - 9.1.0-2
 - fix CVE-2021-37147 CVE-2021-37149 CVE-2021-41585 CVE-2021-43082
 
-- 
Gitee