From 7044f5b497637cf26354dcbbf5c6b11ae6fb2256209283a81d6a98c9e1667894 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 2 Dec 2022 08:23:58 +0000
Subject: [PATCH] Accepting request 1039114 from
 home:mbussolotto:branches:Java:packages

- Use catalina.out for logging (bsc#1205647)
- Added patches:
  * tomcat-9.0-fix_catalina.patch

OBS-URL: https://build.opensuse.org/request/show/1039114
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=248
---
 tomcat-9.0-fix_catalina.patch | 11 +++++++++++
 tomcat-9.0.logrotate          |  1 +
 tomcat.changes                |  7 +++++++
 tomcat.spec                   |  2 ++
 4 files changed, 21 insertions(+)
 create mode 100644 tomcat-9.0-fix_catalina.patch

diff --git a/tomcat-9.0-fix_catalina.patch b/tomcat-9.0-fix_catalina.patch
new file mode 100644
index 0000000..e011406
--- /dev/null
+++ b/tomcat-9.0-fix_catalina.patch
@@ -0,0 +1,11 @@
+Index: apache-tomcat-9.0.43-src/conf/logging.properties
+===================================================================
+--- apache-tomcat-9.0.43-src.orig/conf/logging.properties
++++ apache-tomcat-9.0.43-src/conf/logging.properties
+@@ -77,3 +77,6 @@ org.apache.catalina.core.ContainerBase.[
+ 
+ # To see debug messages for WebSocket handling, uncomment the following line:
+ #org.apache.tomcat.websocket.level = FINE
++
++1catalina.org.apache.juli.AsyncFileHandler.suffix = out
++1catalina.org.apache.juli.AsyncFileHandler.rotatable = false
diff --git a/tomcat-9.0.logrotate b/tomcat-9.0.logrotate
index b9aface..f2a3848 100644
--- a/tomcat-9.0.logrotate
+++ b/tomcat-9.0.logrotate
@@ -1,4 +1,5 @@
 @@@TCLOG@@@/catalina.out {
+    notifempty
     copytruncate
     weekly
     rotate 52
diff --git a/tomcat.changes b/tomcat.changes
index 5e49e18..d36d8eb 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 14:46:26 UTC 2022 - Michele Bussolotto <michele.bussolotto@suse.com>
+
+- Use catalina.out for logging (bsc#1205647)
+- Added patches:
+  * tomcat-9.0-fix_catalina.patch
+
 -------------------------------------------------------------------
 Mon Nov 21 07:42:34 UTC 2022 - Michele Bussolotto <michele.bussolotto@suse.com>
 
diff --git a/tomcat.spec b/tomcat.spec
index e52de74..1fb1cec 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -90,6 +90,7 @@ Patch11:        tomcat-9.0-CVE-2022-23181.patch
 Patch12:        tomcat-9.0-hardening_getResources.patch
 Patch13:        tomcat-9.0.43-CVE-2021-43980.patch
 Patch14:        tomcat-9.0.43-CVE-2022-42252.patch
+Patch15:        tomcat-9.0-fix_catalina.patch
 
 BuildRequires:  ant >= 1.8.1
 BuildRequires:  ant-antlr
@@ -270,6 +271,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # remove date from docs
 sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl