From aa95568121572785df48b6ffc76df413c0b88b23 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Wed, 28 May 2025 17:19:14 -0400
Subject: [PATCH] Use non-versioned file for slf4j2 jar

---
 debian/apparmor/i2p     | 1 +
 debian/i2p-router.links | 4 ++--
 debian/rules            | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/apparmor/i2p b/debian/apparmor/i2p
index f10b8a268..743c57512 100644
--- a/debian/apparmor/i2p
+++ b/debian/apparmor/i2p
@@ -74,6 +74,7 @@
   /usr/share/java/servlet-api.jar                         r,
   /usr/share/java/servlet-api-*.jar                       r,
   /usr/share/java/slf4j-*.jar                             r,
+  /usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar    r,
   /usr/share/java/standard.jar                            r,
   /usr/share/java/standard-*.jar                          r,
   /usr/share/java/tomcat9-*.jar                           r,
diff --git a/debian/i2p-router.links b/debian/i2p-router.links
index d511f1875..17abecbd8 100644
--- a/debian/i2p-router.links
+++ b/debian/i2p-router.links
@@ -37,8 +37,8 @@ usr/share/java/jetty12-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
 usr/share/java/servlet-api.jar usr/share/i2p/lib/javax.servlet.jar
 # combined into javax.servlet.jar in non-package builds
 usr/share/java/jsp-api.jar usr/share/i2p/lib/jsp-api.jar
-# the libslf4j-java package does NOT provide a non-versioned file
-usr/share/java/slf4j-api-2.0.17.jar usr/share/i2p/lib/slf4j-api.jar
+# the libslf4j2-java package does NOT provide a non-versioned file except in the maven-repo dir
+usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar usr/share/i2p/lib/slf4j-api.jar
 
 
 # comment out if not building with libtomcat9-java
diff --git a/debian/rules b/debian/rules
index b8226289e..0a8d76445 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,8 +126,8 @@ endif
 	ln -sf /usr/share/java/servlet-api.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
 	@# this is roughly the same as tomcat8-jsp-api.jar, we use this one
 	ln -sf /usr/share/java/jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
-	@# the libslf4j-java package does NOT provide a non-versioned file
-	ln -sf /usr/share/java/slf4j-api-2.0.17.jar $(CURDIR)/apps/jetty/jettylib/slf4j-api.jar
+	@# the libslf4j2-java package does NOT provide a non-versioned file except in the maven-repo dir
+	ln -sf /usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar $(CURDIR)/apps/jetty/jettylib/slf4j-api.jar
 
 	@# debian and ubuntu: buster, disco
 	@/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties