[Git][clojure-team/trapperkeeper-clojure][debian/main] 6 commits: d/patches: target clojure 1.x
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Mon Feb 6 23:50:33 GMT 2023
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / trapperkeeper-clojure
Commits:
d08e27c6 by Jérôme Charaoui at 2023-02-05T19:21:16-05:00
d/patches: target clojure 1.x
- - - - -
03093212 by Jérôme Charaoui at 2023-02-06T18:17:45-05:00
d/patches: drop jackson and snakeyaml version overrides
Avoid leaking bogus dependency versions in maven-repo. Requires updated
build-deps where the issue is fixed and makes the project.clj overrides
obsolete.
- - - - -
772304bc by Jérôme Charaoui at 2023-02-06T18:21:54-05:00
d/patches: add patch fixing a crash upon SIGHUP
- - - - -
044b038f by Jérôme Charaoui at 2023-02-06T18:31:36-05:00
d/patches: fixup typo in lein local patch
Gbp-Dch: ignore
- - - - -
07e766db by Jérôme Charaoui at 2023-02-06T18:35:08-05:00
d/tests: add allow-stderr to upstream unittests
- - - - -
f7a25269 by Jérôme Charaoui at 2023-02-06T18:35:29-05:00
Update changelog for 3.2.0-2 release
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/patches/0001_Lein_Local.patch
- debian/patches/0003-Remove-nREPL-dependency.patch
- + debian/patches/0004-PDB-5215-Avoid-clojure.java.io-resource-NPE-on-SIGHU.patch
- debian/patches/series
- debian/tests/control
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,18 @@
-trapperkeeper-clojure (3.2.0-2) UNRELEASED; urgency=medium
+trapperkeeper-clojure (3.2.0-2) unstable; urgency=medium
- * Team upload.
* remove dependency on nrepl-clojure
-
- -- Jérôme Charaoui <jerome at riseup.net> Fri, 03 Feb 2023 11:29:46 -0500
+ * d/control: add myself to Uploaders
+ * d/control: bump Standards-Version, no changes needed
+ * d/patches:
+ + add patch fixing a crash upon SIGHUP
+ + leiningen patch not relevant upstream
+ + target clojure 1.x instead of 1.10.x
+ - drop jackson and snakeyaml version overrides
+ * d/rules: get rid of override_jh_installlibs
+ * d/tests: run nrepl autopkgtest on amd64/arm64 only
+ * d/tests: add allow-stderr to upstream unittests
+
+ -- Jérôme Charaoui <jerome at riseup.net> Mon, 06 Feb 2023 18:26:01 -0500
trapperkeeper-clojure (3.2.0-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -12,17 +12,17 @@ Build-Depends:
leiningen,
libbeckon-clojure,
libclj-time-clojure (>= 0.15.2),
- libclj-yaml-clojure,
+ libclj-yaml-clojure (>= 0.7.2),
libclojure-java,
libcomplete-clojure <!nocheck>,
libcore-async-clojure (>=1.3.610-4),
libjanino-java,
- libkitchensink-clojure (>= 3.1.1-2),
+ libkitchensink-clojure (>= 3.2.1),
liblogback-java,
libnrepl-clojure <!nocheck>,
libprismatic-plumbing-clojure (>= 0.5.5-2),
libprismatic-schema-clojure (>= 1.1.12),
- libpuppetlabs-i18n-clojure (>= 0.9.0),
+ libpuppetlabs-i18n-clojure (>= 0.9.2-2),
libraynes-fs-clojure (>= 1.5.2),
libslf4j-java,
libtools-logging-clojure,
=====================================
debian/patches/0001_Lein_Local.patch
=====================================
@@ -4,14 +4,14 @@ Subject: Patch project.clj to build locally with lein.
Forwarded: not-needed
---
- project.clj | 55 ++++++++++++++++++++++++++++++-------------------------
- 1 file changed, 30 insertions(+), 25 deletions(-)
+ project.clj | 47 ++++++++++++++++++++++-------------------------
+ 1 file changed, 22 insertions(+), 25 deletions(-)
diff --git a/project.clj b/project.clj
-index 274756b..f565446 100644
+index 274756b..142828a 100644
--- a/project.clj
+++ b/project.clj
-@@ -6,42 +6,44 @@
+@@ -6,42 +6,39 @@
:min-lein-version "2.9.0"
@@ -26,7 +26,7 @@ index 274756b..f565446 100644
- [org.clojure/tools.logging]
- [org.clojure/tools.macro]
- [org.clojure/core.async]
-+ :dependencies [[org.clojure/clojure "1.10.x"]
++ :dependencies [[org.clojure/clojure "1.x"]
+ [org.clojure/tools.logging "debian"]
+ [org.clojure/tools.macro "debian"]
+ [org.clojure/core.async "debian"]
@@ -46,39 +46,34 @@ index 274756b..f565446 100644
;; Janino can be used for some advanced logback configurations
- [org.codehaus.janino/janino]
+ [org.codehaus.janino/janino "debian"]
-+
-+ [clj-time "debian"]
-+ [clj-commons/fs "debian"]
-+ [clj-commons/clj-yaml "debian"]
- [clj-time]
- [clj-commons/fs]
- [clj-commons/clj-yaml]
-+ [prismatic/plumbing "debian"]
-+ [prismatic/schema "debian"]
++ [clj-time "debian"]
++ [clj-commons/fs "debian"]
++ [clj-commons/clj-yaml "debian"]
- [prismatic/plumbing]
- [prismatic/schema]
-+ [beckon "debian"]
++ [prismatic/plumbing "debian"]
++ [prismatic/schema "debian"]
- [beckon]
-+ [puppetlabs/typesafe-config "debian"]
-+ [puppetlabs/kitchensink "debian"]
-+ [puppetlabs/i18n "debian"]
-+ [nrepl/nrepl "debian"]
++ [beckon "debian"]
- [puppetlabs/typesafe-config]
- [puppetlabs/kitchensink]
- [puppetlabs/i18n]
- [nrepl/nrepl]
-+ [org.yaml/snakeyaml "1.x"]
-+ [com.fasterxml.jackson.core/jackson-core "2.x"]
-+ [com.fasterxml.jackson.dataformat/jackson-dataformat-smile "2.x"]
-+ [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor "2.x"]
++ [puppetlabs/typesafe-config "debian"]
++ [puppetlabs/kitchensink "debian"]
++ [puppetlabs/i18n "debian"]
++ [nrepl/nrepl "debian"]
]
:deploy-repositories [["releases" {:url "https://clojars.org/repo"
-@@ -61,14 +63,17 @@
+@@ -61,14 +58,14 @@
:profiles {:dev {:source-paths ["examples/shutdown_app/src"
"examples/java_service/src/clj"]
:java-source-paths ["examples/java_service/src/java"]
@@ -91,10 +86,7 @@ index 274756b..f565446 100644
- :plugins [[lein-parent "0.3.7"]
- [puppetlabs/i18n "0.8.0"]]
-+ :plugins [[puppetlabs/i18n "debian" :exclusions [[org.clojure/clojure]
-+ [com.fasterxml.jackson.core/jackson-core]
-+ [com.fasterxml.jackson.dataformat/jackson-dataformat-smile]
-+ [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor]]]]
++ :plugins [[puppetlabs/i18n "debian" :exclusions [org.clojure/clojure]]]
:main puppetlabs.trapperkeeper.main
+ :local-repo "debian/maven-repo"
=====================================
debian/patches/0003-Remove-nREPL-dependency.patch
=====================================
@@ -15,7 +15,7 @@ Forwarded: not-needed
1 file changed, 1 deletion(-)
diff --git a/project.clj b/project.clj
-index f565446..259c96b 100644
+index 142828a..903d560 100644
--- a/project.clj
+++ b/project.clj
@@ -38,7 +38,6 @@
@@ -23,6 +23,6 @@ index f565446..259c96b 100644
[puppetlabs/kitchensink "debian"]
[puppetlabs/i18n "debian"]
- [nrepl/nrepl "debian"]
+ ]
- [org.yaml/snakeyaml "1.x"]
- [com.fasterxml.jackson.core/jackson-core "2.x"]
+ :deploy-repositories [["releases" {:url "https://clojars.org/repo"
=====================================
debian/patches/0004-PDB-5215-Avoid-clojure.java.io-resource-NPE-on-SIGHU.patch
=====================================
@@ -0,0 +1,50 @@
+From: Rob Browning <rlb at puppet.com>
+Date: Mon, 6 Feb 2023 12:15:41 -0600
+Subject: (PDB-5215) Avoid clojure.java.io/resource NPE on SIGHUP
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Right now, io/resource can crash if the current thread's context class
+loader is nil, which can sometimes be the case, and is the case with
+current puppetdb versions after startup and before processing any
+commands.
+
+Avoid the crash by falling back to the system class loader when the
+thread's is nil.
+
+cf. https://clojure.atlassian.net/browse/CLJ-2431
+
+Thanks to Jérôme Charaoui for coming up with the reproduction that
+allowed tracking down the problem.
+
+Forwarded: not-needed
+Origin: upstream, https://github.com/puppetlabs/trapperkeeper/pull/304/commits/a64003119574a4fb243389ed973b46ab97347be2
+---
+ src/puppetlabs/trapperkeeper/bootstrap.clj | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/puppetlabs/trapperkeeper/bootstrap.clj b/src/puppetlabs/trapperkeeper/bootstrap.clj
+index 2980452..f07d861 100644
+--- a/src/puppetlabs/trapperkeeper/bootstrap.clj
++++ b/src/puppetlabs/trapperkeeper/bootstrap.clj
+@@ -93,11 +93,18 @@
+ (log/debug (i18n/trs "Loading bootstrap config from current working directory: ''{0}''" config-file-path))
+ [config-file-path]))))
+
++(defn- resource [name]
++ ;; Fixes io/resource crashes when context class loader is nil.
++ ;; https://clojure.atlassian.net/browse/CLJ-2431
++ (.getResource (or (.getContextClassLoader (Thread/currentThread))
++ (ClassLoader/getSystemClassLoader))
++ name))
++
+ (schema/defn config-from-classpath :- [(schema/maybe schema/Str)]
+ "Check to see if there is a bootstrap config file available on the classpath;
+ if so, return it."
+ []
+- (when-let [classpath-config (io/resource bootstrap-config-file-name)]
++ (when-let [classpath-config (resource bootstrap-config-file-name)]
+ (log/debug (i18n/trs "Loading bootstrap config from classpath: ''{0}''" classpath-config))
+ [(str classpath-config)]))
+
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
0001_Lein_Local.patch
0002_Fix_Testsuite_Failure.patch
0003-Remove-nREPL-dependency.patch
+0004-PDB-5215-Avoid-clojure.java.io-resource-NPE-on-SIGHU.patch
=====================================
debian/tests/control
=====================================
@@ -9,6 +9,7 @@ Depends:
clojure,
libbultitude-clojure,
@,
+Restrictions: allow-stderr
Tests: nrepl
Architecture: amd64, arm64
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-clojure/-/compare/875a7d49d1d0dc974ac2988d7ff4933c9abfdfbe...f7a252699c0cfa1e685f4492dddca997870cd2a3
--
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-clojure/-/compare/875a7d49d1d0dc974ac2988d7ff4933c9abfdfbe...f7a252699c0cfa1e685f4492dddca997870cd2a3
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/20230206/7c687fbf/attachment.htm>
More information about the pkg-java-commits
mailing list