From bed4563257dd35303ee13ae468dc6d100f6167ce Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 19 Oct 2022 12:33:06 -0400 Subject: [PATCH] Debian: Change dependency from transitional package libservlet3.1-java to libjsp-api-java and libservlet-api-java and update symbolic links to the jars in /usr/share/java Note that the previous symlink to servlet-api-3.1.jar was another symlink to servlet-api.jar which was actually API 4 anyway. --- debian-alt/bionic/control | 6 ++++-- debian-alt/bionic/i2p-router.links | 5 ++--- debian-alt/bionic/rules | 8 ++++---- debian-alt/focal/rules | 6 +++--- debian/control | 6 ++++-- debian/i2p-router.links | 6 +++--- debian/rules | 6 +++--- 7 files changed, 23 insertions(+), 20 deletions(-) diff --git a/debian-alt/bionic/control b/debian-alt/bionic/control index 5441d6521..f83aa9d9a 100644 --- a/debian-alt/bionic/control +++ b/debian-alt/bionic/control @@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 9.20160709) ,debconf ,openjdk-8-jdk ,libjetty9-java (>= 9.4) - ,libservlet3.1-java + ,libjsp-api-java + ,libservlet-api-java ,libtaglibs-standard-jstlel-java ,libtomcat9-java ,dh-apparmor @@ -81,7 +82,8 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, libgetopt-java, libjson-simple-java (>= 2),libjson-simple-java (<< 3), libjetty9-java (>= 9.4), - libservlet3.1-java, + libjsp-api-java, + libservlet-api-java, libtaglibs-standard-jstlel-java, libtomcat9-java, famfamfam-flag-png diff --git a/debian-alt/bionic/i2p-router.links b/debian-alt/bionic/i2p-router.links index 2b14e57c3..5dffcd070 100644 --- a/debian-alt/bionic/i2p-router.links +++ b/debian-alt/bionic/i2p-router.links @@ -26,11 +26,10 @@ usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar # legacy name in lib/ usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar -# following two are from libservlet3.1-java which is a dependency of libjetty9-java # legacy name in lib/ -usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.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-2.3.jar usr/share/i2p/lib/jsp-api.jar +usr/share/java/jsp-api.jar usr/share/i2p/lib/jsp-api.jar # comment out if not building with libtomcat9-java diff --git a/debian-alt/bionic/rules b/debian-alt/bionic/rules index 05cc44fbe..40cd59083 100755 --- a/debian-alt/bionic/rules +++ b/debian-alt/bionic/rules @@ -108,10 +108,10 @@ endif ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar - @# following two are from libservlet3.1-java which is a dependency of libjetty9-java - ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar - @# this is roughly the same as tomcat9-jsp-api.jar, we use this one - ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar + @# following two are formerly from libservlet3.1-java, now in their own packages + 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 @# debian and ubuntu: wheezy-backports, jessie+, xenial+ @/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties diff --git a/debian-alt/focal/rules b/debian-alt/focal/rules index 0edad4502..06227597f 100755 --- a/debian-alt/focal/rules +++ b/debian-alt/focal/rules @@ -106,10 +106,10 @@ endif ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar - @# following two are from libservlet3.1-java which is a dependency of libjetty9-java - ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar + @# following two are formerly from libservlet3.1-java, now in their own packages + 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-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar + ln -sf /usr/share/java/jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar @# debian and ubuntu: buster, disco @/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties diff --git a/debian/control b/debian/control index c20665211..90f2a6845 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,8 @@ Build-Depends: debhelper (>= 9.20160709) ,debconf ,default-jdk ,libjetty9-java (>= 9.4) - ,libservlet3.1-java + ,libjsp-api-java + ,libservlet-api-java ,libtaglibs-standard-jstlel-java ,libtomcat9-java ,dh-apparmor @@ -85,7 +86,8 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, libgetopt-java, libjson-simple-java (>= 2),libjson-simple-java (<< 3), libjetty9-java (>= 9.4), - libservlet3.1-java, + libjsp-api-java, + libservlet-api-java, libtaglibs-standard-jstlel-java, libtomcat9-java, famfamfam-flag-png, diff --git a/debian/i2p-router.links b/debian/i2p-router.links index fb32bac1a..83a4865ad 100644 --- a/debian/i2p-router.links +++ b/debian/i2p-router.links @@ -30,11 +30,10 @@ usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar # legacy name in lib/ usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar -# following two are from libservlet3.1-java which is a dependency of libjetty9-java # legacy name in lib/ -usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.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-2.3.jar usr/share/i2p/lib/jsp-api.jar +usr/share/java/jsp-api.jar usr/share/i2p/lib/jsp-api.jar # comment out if not building with libtomcat9-java @@ -50,6 +49,7 @@ usr/share/java/tomcat9-util.jar usr/share/i2p/lib/tomcat-util.jar usr/share/java/tomcat9-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar # combined into commons-el.jar in non-package builds usr/share/java/tomcat9-jasper-el.jar usr/share/i2p/lib/jasper-el.jar +-# following two are formerly from libservlet3.1-java, now in their own packages # legacy name in lib/ usr/share/java/tomcat9-el-api.jar usr/share/i2p/lib/commons-el.jar # tomcat9 pulls in libeclipse-jdk-core-java, link to it for eepsite webapps needing a compiler diff --git a/debian/rules b/debian/rules index 5d71ccddc..3777f1209 100755 --- a/debian/rules +++ b/debian/rules @@ -118,10 +118,10 @@ endif ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar - @# following two are from libservlet3.1-java which is a dependency of libjetty9-java - ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar + @# following two are formerly from libservlet3.1-java, now in their own packages + 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-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar + ln -sf /usr/share/java/jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar @# debian and ubuntu: buster, disco @/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties