From 92a646151536d65b623b92f3c13ceabee8b2a43f Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 4 Apr 2024 06:56:10 +0000
Subject: [PATCH] import CS mod_jk-1.2.49-1.el9

---
 .gitignore               |  2 +-
 .mod_jk.metadata         |  2 +-
 SOURCES/mod_jk-part.conf |  2 ++
 SPECS/mod_jk.spec        | 32 +++++++++++++++++++++++++++-----
 4 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 SOURCES/mod_jk-part.conf

diff --git a/.gitignore b/.gitignore
index d6a4ddc..4ede74e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tomcat-connectors-1c14fc065bc133887fdde55cab954691b3dc3aac.tar.gz
+SOURCES/tomcat-connectors-3ad622409ae3335df9f353bef8ebc4d72a70fd6d.tar.gz
diff --git a/.mod_jk.metadata b/.mod_jk.metadata
index 0b5d757..44ccc1b 100644
--- a/.mod_jk.metadata
+++ b/.mod_jk.metadata
@@ -1 +1 @@
-78c942f3556d9b490c477f4a12c5217204c496ee SOURCES/tomcat-connectors-1c14fc065bc133887fdde55cab954691b3dc3aac.tar.gz
+6e2832914fa375a76212bfc50d8adfa68a536077 SOURCES/tomcat-connectors-3ad622409ae3335df9f353bef8ebc4d72a70fd6d.tar.gz
diff --git a/SOURCES/mod_jk-part.conf b/SOURCES/mod_jk-part.conf
new file mode 100644
index 0000000..94af3a6
--- /dev/null
+++ b/SOURCES/mod_jk-part.conf
@@ -0,0 +1,2 @@
+d /run/mod_jk 0755 root root -
+f /run/mod_jk.pid 0755 root root -
diff --git a/SPECS/mod_jk.spec b/SPECS/mod_jk.spec
index d7e5eda..5c51e95 100644
--- a/SPECS/mod_jk.spec
+++ b/SPECS/mod_jk.spec
@@ -29,22 +29,24 @@
 %define aprincludes %(%{aprconf} --includes 2>/dev/null)
 
 # Update commitid and serial when new sources and release version are available
-%global commitid 1c14fc065bc133887fdde55cab954691b3dc3aac
-%global serial 22
+%global commitid 3ad622409ae3335df9f353bef8ebc4d72a70fd6d
+%global serial 1
 
 Name:      mod_jk
 Epoch:     0
-Version:   1.2.48
+Version:   1.2.49
 Release:   %{serial}%{?dist}
 Summary:   Tomcat mod_jk connector for Apache
 
 Group:     Internet/WWW/Servers
 License:   ASL 2.0
 URL:       http://tomcat.apache.org
+# You can get the tarball from https://github.com/apache/tomcat-connectors/archive/3ad622409ae3335df9f353bef8ebc4d72a70fd6d.tar.gz
 Source0:   tomcat-connectors-%{commitid}.tar.gz
 Source1:   %{pkg_name}.conf.sample
 Source2:   uriworkermap.properties.sample
 Source3:   workers.properties.sample
+Source4:   %{pkg_name}-part.conf
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -60,6 +62,7 @@ BuildRequires: java-devel >= 1.6.0
 BuildRequires: jpackage-utils >= 0:1.5.38
 BuildRequires: libtool
 BuildRequires: xalan-j2 >= 2.7.0
+BuildRequires: systemd
 Obsoletes: mod_jk-ap24 < 0:1.2.48-21
 
 %description
@@ -120,6 +123,13 @@ popd
 %define aprincludes %(%{aprconf} --includes 2>/dev/null)
 
 %{__rm} -rf $RPM_BUILD_ROOT
+# bz#2047969 start
+mkdir -p %{buildroot}%{_tmpfilesdir}
+install -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+install -d -m 0755 %{buildroot}%{_rundir}/%{name}/
+touch %{buildroot}%{_rundir}/%{name}.pid
+chmod 0755 %{buildroot}%{_rundir}/%{name}.pid
+# bz#2047969 end
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
 install -p -m 0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
 %{__sed} -i -e 's|/usr/local/bin\b|%{_bindir}|' tools/reports/*.pl
@@ -129,7 +139,7 @@ command="s|/usr/local/bin\b|%{_bindir}|"
 %{__install} -p -m 0755 native/apache-2.0/%{pkg_name}.so \
         ${RPM_BUILD_ROOT}/%{aplibdir}/%{pkg_name}.so
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}/%{_bindir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}/%{_var}/run/%{name}
+%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_rundir}/%{name}
 %{__install} -d -m 0700 ${RPM_BUILD_ROOT}/%{_var}/cache/httpd/%{name}
 
 # for tools
@@ -147,8 +157,12 @@ command="s|/usr/local/bin\b|%{_bindir}|"
 %doc native/LICENSE native/NOTICE native/README.txt
 %{aplibdir}/*
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*
-%dir %{_var}/run/%{name}
 %attr(0700,apache,apache) %dir %{_var}/cache/httpd/%{name}
+# bz#2047969 start
+%dir %{_rundir}/%{name}/
+%verify(not size mtime md5) %{_rundir}/%{name}.pid
+%{_tmpfilesdir}/%{name}.conf
+# bz#2047969 end
 
 %if %with tools
 %files tools
@@ -158,6 +172,14 @@ command="s|/usr/local/bin\b|%{_bindir}|"
 %endif
 
 %changelog
+* Thu Feb 29 2024 Sokratis Zappis <szappis@redhat.com> - 1.2.49-1
+- Related: RHEL-27511 - Rebase to upstream 1.2.49 release
+
+* Thu Jan 12 2023 Sokratis Zappis <szappis@rehdat.com> - 1.2.48-23
+- Add entries for tmpfiles.d mechanism
+- Remove /var/run legacy location
+- Resolves: rhbz#2047969
+
 * Tue Aug 24 2021 George Zaronikas <gzaronik@redhat.com> - 1.2.48-22
 - Specifying exact NVR in Obsoletes to avoid conflict with -ap24 subpackage
 - Resolves: #1963135