[Git][clojure-team/trapperkeeper-webserver-jetty9-clojure][debian/main] 3 commits: * d/p/resolve-ftbfs-with-java-21.patch: apply puppetserver Java 21

[Jérôme Charaoui (@lavamind)]

Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / trapperkeeper-webserver-jetty9-clojure


Commits:
c831820e by Vladimir Petko at 2024-03-07T15:40:19+13:00
  * d/p/resolve-ftbfs-with-java-21.patch: apply puppetserver Java 21
    patch to resolve ftbfs (Closes: #1065449).

- - - - -
3c58fb9a by Vladimir Petko at 2024-03-07T15:40:52+13:00
changelog

- - - - -
7c0909db by Jérôme Charaoui at 2024-03-09T14:11:57+00:00
Merge branch 'debian/main' into 'debian/main'

Resolve ftbfs due to the fips clause

See merge request clojure-team/trapperkeeper-webserver-jetty9-clojure!1
- - - - -


3 changed files:

- debian/changelog
- + debian/patches/resolve-ftbfs-with-java-21.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+trapperkeeper-webserver-jetty9-clojure (4.5.2-2) UNRELEASED; urgency=medium
+
+  * d/p/resolve-ftbfs-with-java-21.patch: apply puppetserver Java 21
+    patch to resolve ftbfs (Closes: #1065449).
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Thu, 07 Mar 2024 15:40:02 +1300
+
 trapperkeeper-webserver-jetty9-clojure (4.5.2-1) unstable; urgency=medium
 
   * New upstream version 4.5.2


=====================================
debian/patches/resolve-ftbfs-with-java-21.patch
=====================================
@@ -0,0 +1,18 @@
+Description: Resolve FTBFS with Java 21
+Author: Jérôme Charaoui <jerome at riseup.net>
+Forwarded: not-needed
+
+This removes an exception from project.clj's :fips profile which throws an
+exception when Java 21 is used, regardless of whether the profile is activated
+or not.
+--- a/project.clj
++++ b/project.clj
+@@ -106,7 +106,7 @@
+                                         (throw unsupported-ex))
+                                     11 ["-Djava.security.properties==dev-resources/jdk11-fips-security"]
+                                     17 ["-Djava.security.properties==dev-resources/jdk11-fips-security"]
+-                                    (throw unsupported-ex)))}]
++                                    (do)))}]
+ 
+              :testutils {:source-paths ^:replace ["test/clj"]
+                          :java-source-paths ^:replace ["test/java"]}}


=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@
 0008_Jetty_Post_Config_Failure.patch
 0009_Testsuite_Requires_Network.patch
 make-service-test-less-sensitive.patch
+resolve-ftbfs-with-java-21.patch



View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-webserver-jetty9-clojure/-/compare/6e4ad9e5e940f0a63d50e81a7036e85cc3b24309...7c0909db8bd8824f3202c5f3749aed0a06b92de4

-- 
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-webserver-jetty9-clojure/-/compare/6e4ad9e5e940f0a63d50e81a7036e85cc3b24309...7c0909db8bd8824f3202c5f3749aed0a06b92de4
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240309/ee33b1f1/attachment.htm>