rpms/tomcat
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: rhbz#1510522 man page uid and gid mismatch for service accounts

Browse Source
This commit is contained in:
Coty Sutherland 2019-09-26 16:05:30 -04:00
parent 98e48e45f4
commit 582d8e2270
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tomcat.spec
View File

@ -35,7 +35,7 @@
%global packdname apache-tomcat-%{version}-src %global packdname apache-tomcat-%{version}-src
%global servletspec 4.0 %global servletspec 4.0
%global elspec 3.0 %global elspec 3.0
%global tcuid 91 %global tcuid 53
# Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java # Recommended version is specified in java/org/apache/catalina/core/AprLifecycleListener.java
%global native_version 1.2.21 %global native_version 1.2.21
@ -59,7 +59,7 @@
Name: tomcat Name: tomcat
Epoch: 1 Epoch: 1
Version: %{major_version}.%{minor_version}.%{micro_version} Version: %{major_version}.%{minor_version}.%{micro_version}
Release: 1%{?dist} Release: 2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
License: ASL 2.0 License: ASL 2.0
@ -455,9 +455,14 @@ done
%pre %pre
# add the tomcat user and group # add the tomcat user and group
%{_sbindir}/groupadd -g %{tcuid} -r tomcat 2>/dev/null || : getent group tomcat >/dev/null || %{_sbindir}/groupadd -f -g %{tcuid} -r tomcat
%{_sbindir}/useradd -c "Apache Tomcat" -u %{tcuid} -g tomcat \ if ! getent passwd tomcat >/dev/null ; then
-s /sbin/nologin -r -d %{homedir} tomcat 2>/dev/null || : if ! getent passwd %{tcuid} >/dev/null ; then
%{_sbindir}/useradd -r -u %{tcuid} -g tomcat -d %{homedir} -s /sbin/nologin -c "Apache Tomcat" tomcat
# Tomcat uses a reserved ID, so there should never be an else
fi
fi
exit 0
%post %post
# install but don't activate # install but don't activate
@ -610,6 +615,9 @@ fi
%attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out
%changelog %changelog
* Thu Sep 26 2019 Coty Sutherland <csutherl@redhat.com> - 1:9.0.26-2
- Resolves: rhbz#1510522 man page uid and gid mismatch for service accounts
* Thu Sep 26 2019 Coty Sutherland <csutherl@redhat.com> - 1:9.0.26-1 * Thu Sep 26 2019 Coty Sutherland <csutherl@redhat.com> - 1:9.0.26-1
- Update to 9.0.26 - Update to 9.0.26
- Resolves: rhbz#1523112 tomcat systemd does not cope with - in service names - Resolves: rhbz#1523112 tomcat systemd does not cope with - in service names