[Git][clojure-team/trapperkeeper-metrics-clojure][debian/main] 6 commits: New upstream version 1.5.0
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Fri Oct 21 14:36:19 BST 2022
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / trapperkeeper-metrics-clojure
Commits:
263c73c8 by Jérôme Charaoui at 2022-10-21T08:26:50-04:00
New upstream version 1.5.0
- - - - -
ab683ea2 by Jérôme Charaoui at 2022-10-21T08:26:56-04:00
Update upstream source from tag 'upstream/1.5.0'
Update to upstream version '1.5.0'
with Debian dir 5d057593a34837bd11b94ddf5c7293d24ffb3bbd
- - - - -
222277ca by Jérôme Charaoui at 2022-10-21T09:08:44-04:00
d/patches: rebase for new upstream version
- - - - -
cbf2e3cb by Jérôme Charaoui at 2022-10-21T09:30:21-04:00
d/patches: cleanup unused test script
Gbp-Dch: ignore
- - - - -
a14fe253 by Jérôme Charaoui at 2022-10-21T09:30:22-04:00
regenerate pki for tests, should fix repro builds
- - - - -
833c1298 by Jérôme Charaoui at 2022-10-21T09:31:33-04:00
Update changelog for 1.5.0-1 release
- - - - -
14 changed files:
- + .github/workflows/snyk_merge.yaml
- .travis.yml
- CHANGELOG.md
- CODEOWNERS
- debian/changelog
- debian/copyright
- + debian/gen-pki.exts.cnf
- + debian/gen-pki.sh
- debian/patches/0001_Lein_Local.patch
- debian/patches/0002-Add-undeclared-dependency-on-clojure.set-in-tests.patch
- debian/rules
- − debian/tests/unittests
- debian/tests/upstream
- project.clj
Changes:
=====================================
.github/workflows/snyk_merge.yaml
=====================================
@@ -0,0 +1,29 @@
+---
+name: Snyk Clojure Merge
+
+on: push
+
+jobs:
+ snyk_clojure:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Connect to Twingate
+ uses: twingate/github-action at v1
+ with:
+ service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
+ - name: checkout the current head
+ uses: actions/checkout at v2
+ with:
+ fetch-depth: 1
+ persist-credentials: false
+ - name: Run Clojure Snyk Scan
+ id: scan
+ uses: puppetlabs/security-snyk-clojure-action at v2
+ with:
+ snykToken: ${{ secrets.SNYK_PE_TOKEN }}
+ snykOrg: 'puppet-enterprise'
+ snykProject: 'trapperkeeper-metrics'
+ snykPolicy: '.snyk'
+ - name: Check output
+ if: steps.scan.outputs.vulns != ''
+ run: echo "Vulnerabilities detected; ${{ steps.scan.outputs.vulns }}" && exit 1
=====================================
.travis.yml
=====================================
@@ -1,5 +1,5 @@
language: clojure
-lein: 2.9.1
+lein: 2.9.10
jobs:
include:
- stage: jdk8
=====================================
CHANGELOG.md
=====================================
@@ -1,3 +1,7 @@
+## 1.5.0
+
+* update clj-parent to 5.2.6 to allow use of bouncy-castle libs `18on` that replaced the `15on` naming
+
## 1.4.3 (1.4.2 release failed, do not use)
* Update project specification to work correctly in FIPS mode.
=====================================
CODEOWNERS
=====================================
@@ -1,4 +1 @@
-# This will cause the puppetserver-maintainers group to be assigned
-# review of any opened PRs against the branches containing this file.
-
-* @puppetlabs/puppetserver-maintainers
+* @puppetlabs/dumpling
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+trapperkeeper-metrics-clojure (1.5.0-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream version 1.5.0
+ * d/patches: rebase for new upstream version
+ * regenerate pki for tests, should fix repro builds
+
+ -- Jérôme Charaoui <jerome at riseup.net> Fri, 21 Oct 2022 09:01:12 -0400
+
trapperkeeper-metrics-clojure (1.4.3-1) unstable; urgency=medium
* Team upload.
=====================================
debian/copyright
=====================================
@@ -3,6 +3,8 @@ Upstream-Name: puppetlabs-trapperkeeper-metrics
Source: https://github.com/puppetlabs/trapperkeeper-metrics
Files: *
+ debian/gen-pki.sh
+ debian/gen-pki.exts.cnf
Copyright: (C) 2005-2015 Puppet Labs Inc
License: Apache-2.0
=====================================
debian/gen-pki.exts.cnf
=====================================
@@ -0,0 +1,31 @@
+[ req ]
+#default_bits = 2048
+#default_md = sha256
+#default_keyfile = privkey.pem
+distinguished_name = req_distinguished_name
+attributes = req_attributes
+
+[ req_distinguished_name ]
+countryName = Country Name (2 letter code)
+countryName_min = 2
+countryName_max = 2
+stateOrProvinceName = State or Province Name (full name)
+localityName = Locality Name (eg, city)
+0.organizationName = Organization Name (eg, company)
+organizationalUnitName = Organizational Unit Name (eg, section)
+commonName = Common Name (eg, fully qualified host name)
+commonName_max = 64
+
+[ req_attributes ]
+
+# This section should be referenced when building an x509v3 CA
+# Certificate.
+# The default path length and the key usage can be overridden
+# modified by setting the CERTPATHLEN and CERTUSAGE environment
+# variables.
+[x509v3_CA]
+subjectKeyIdentifier = hash
+basicConstraints=critical,CA:true
+keyUsage=digitalSignature,keyCertSign,cRLSign
+authorityKeyIdentifier=keyid
+
=====================================
debian/gen-pki.sh
=====================================
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+if ! [[ -d dev-resources/ssl ]]; then
+ echo "This script must be called from the root of the project and dev-resources/ssl must already exist"
+ exit 1
+fi
+
+echo
+echo "Generating primary self-signed CA"
+openssl req -x509 \
+ -newkey rsa:4096 \
+ -keyout dev-resources/ssl/ca.key \
+ -out dev-resources/ssl/ca.pem \
+ -days 1825 -nodes \
+ -extensions x509v3_CA \
+ -config dev-resources/exts.cnf \
+ -subj "/C=US/ST=OR/L=Portland/O=Puppet, Inc/CN=puppet"
+
+echo
+echo "Generating node cert"
+openssl genrsa -out dev-resources/ssl/key.pem 2048
+
+echo
+echo "Creating node CSR"
+openssl req -new -sha256 \
+ -key dev-resources/ssl/key.pem \
+ -out dev-resources/ssl/csr.pem \
+ -subj "/C=US/ST=OR/L=Portland/O=Puppet, Inc/CN=localhost"
+
+echo
+echo "Signing node CSR"
+openssl x509 -req \
+ -in dev-resources/ssl/csr.pem \
+ -CA dev-resources/ssl/ca.pem \
+ -CAkey dev-resources/ssl/ca.key \
+ -CAcreateserial \
+ -out dev-resources/ssl/cert.pem \
+ -days 1825 -sha256
+
+
+echo
+echo "Cleaning up files that will not be used by the tests"
+rm dev-resources/ssl/{ca.key,ca.srl,csr.pem}
=====================================
debian/patches/0001_Lein_Local.patch
=====================================
@@ -8,7 +8,7 @@ Forwarded: not-needed
1 file changed, 41 insertions(+), 35 deletions(-)
diff --git a/project.clj b/project.clj
-index 633e667..fd80d66 100644
+index b47f215..73e9d6c 100644
--- a/project.clj
+++ b/project.clj
@@ -4,34 +4,38 @@
@@ -17,7 +17,7 @@ index 633e667..fd80d66 100644
- :pedantic? :abort
-
-- :parent-project {:coords [puppetlabs/clj-parent "4.6.29"]
+- :parent-project {:coords [puppetlabs/clj-parent "5.2.6"]
- :inherit [:managed-dependencies]}
-
- :dependencies [[org.clojure/clojure]
@@ -93,7 +93,7 @@ index 633e667..fd80d66 100644
:resource-paths ["dev-resources"]}
:dev [:defaults
-- {:dependencies [[org.bouncycastle/bcpkix-jdk15on]]}]
+- {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}]
+ {:dependencies [[org.bouncycastle/bcpkix "debian"]]}]
:fips [:defaults
@@ -102,7 +102,7 @@ index 633e667..fd80d66 100644
;; per https://github.com/technomancy/leiningen/issues/1907
;; the provided profile is necessary for lein jar / lein install
-- :provided {:dependencies [[org.bouncycastle/bcpkix-jdk15on]]
+- :provided {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]
+ :provided {:dependencies [[org.bouncycastle/bcpkix "debian"]]
:resource-paths ["dev-resources"]}
=====================================
debian/patches/0002-Add-undeclared-dependency-on-clojure.set-in-tests.patch
=====================================
@@ -16,7 +16,7 @@ index ca94b60..2162ffb 100644
(:import (com.codahale.metrics.graphite GraphiteSender))
- (:require [schema.core :as schema]))
+ (:require [schema.core :as schema]
-+ [clojure.set :as set]))
++ [clojure.set]))
(def graphite-config
{:graphite
=====================================
debian/rules
=====================================
@@ -21,6 +21,9 @@ override_dh_auto_build:
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ cp debian/gen-pki.sh dev-resources
+ cp debian/gen-pki.exts.cnf dev-resources/exts.cnf
+ ./dev-resources/gen-pki.sh
lein test
endif
=====================================
debian/tests/unittests deleted
=====================================
@@ -1,20 +0,0 @@
-#!/bin/sh
-set -efu
-
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/schema.jar:/usr/share/java/kitchensink.jar:/usr/share/java/kitchensink-test.jar:/usr/share/java/trapperkeeper.jar:/usr/share/java/trapperkeeper-test.jar:/usr/share/java/trapperkeeper-authorization.jar:/usr/share/java/ring-middleware.jar:/usr/share/java/cheshire.jar:/usr/share/java/java.jmx.jar:/usr/share/java/ring-defaults.jar:/usr/share/java/tools.logging.jar:/usr/share/java/metrics-core.jar:/usr/share/java/metrics-graphite.jar:/usr/share/java/comidi.jar:/usr/share/java/puppetlabs-i18n.jar:/usr/share/java/trapperkeeper-metrics.jar:test
-
-cp -a test "$AUTOPKGTEST_TMP"
-cd "$AUTOPKGTEST_TMP"
-
-clojure \
- -cp $CLASSPATH \
- -e "(require '[clojure.test])" \
- -e "(require '[puppetlabs.metrics-test])" \
- -e "(require '[puppetlabs.trapperkeeper.services.metrics.metrics-core-test])" \
- -e "(require '[puppetlabs.trapperkeeper.services.metrics.metrics-service-test])" \
- -e "(require '[puppetlabs.trapperkeeper.services.metrics.testutils-test])" \
- -e "(System/exit (if (clojure.test/successful? (clojure.test/run-tests
- 'puppetlabs.metrics-test
- 'puppetlabs.trapperkeeper.services.metrics.metrics-core-test
- 'puppetlabs.trapperkeeper.services.metrics.metrics-service-test
- 'puppetlabs.trapperkeeper.services.metrics.testutils-test)) 0 1))"
=====================================
debian/tests/upstream
=====================================
@@ -4,11 +4,16 @@ set -efu
CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/schema.jar:/usr/share/java/kitchensink.jar:/usr/share/java/kitchensink-test.jar:/usr/share/java/trapperkeeper.jar:/usr/share/java/trapperkeeper-test.jar:/usr/share/java/trapperkeeper-authorization.jar:/usr/share/java/ring-middleware.jar:/usr/share/java/cheshire.jar:/usr/share/java/java.jmx.jar:/usr/share/java/ring-defaults.jar:/usr/share/java/tools.logging.jar:/usr/share/java/metrics-core.jar:/usr/share/java/metrics-graphite.jar:/usr/share/java/comidi.jar:/usr/share/java/puppetlabs-i18n.jar:/usr/share/java/trapperkeeper-metrics.jar:/usr/share/java/trapperkeeper-webserver-jetty9.jar:test
cp -a dev-resources test "$AUTOPKGTEST_TMP"
+cp debian/gen-pki.sh "$AUTOPKGTEST_TMP/dev-resources"
+cp debian/gen-pki.exts.cnf "$AUTOPKGTEST_TMP/dev-resources/exts.cnf"
cd "$AUTOPKGTEST_TMP"
# needed by puppetlabs.trapperkeeper.testutils.bootstrap
mkdir target
+# regenerate test certificates
+./dev-resources/gen-pki.sh
+
clojure \
-cp $CLASSPATH \
-e "(require '[clojure.test])" \
=====================================
project.clj
=====================================
@@ -1,4 +1,4 @@
-(defproject puppetlabs/trapperkeeper-metrics "1.4.3"
+(defproject puppetlabs/trapperkeeper-metrics "1.5.0"
:description "Trapperkeeper Metrics Service"
:url "http://github.com/puppetlabs/trapperkeeper-metrics"
@@ -6,7 +6,7 @@
:pedantic? :abort
- :parent-project {:coords [puppetlabs/clj-parent "4.6.29"]
+ :parent-project {:coords [puppetlabs/clj-parent "5.2.6"]
:inherit [:managed-dependencies]}
:dependencies [[org.clojure/clojure]
@@ -50,7 +50,7 @@
:resource-paths ["dev-resources"]}
:dev [:defaults
- {:dependencies [[org.bouncycastle/bcpkix-jdk15on]]}]
+ {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}]
:fips [:defaults
{:dependencies [[org.bouncycastle/bcpkix-fips]
@@ -70,7 +70,7 @@
;; per https://github.com/technomancy/leiningen/issues/1907
;; the provided profile is necessary for lein jar / lein install
- :provided {:dependencies [[org.bouncycastle/bcpkix-jdk15on]]
+ :provided {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]
:resource-paths ["dev-resources"]}
:testutils {:source-paths ^:replace ["test"]
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-metrics-clojure/-/compare/3219954a91cc01bf5df97d193ea83baa389809e3...833c12980a415747e0c68b4666c903901f1d537d
--
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-metrics-clojure/-/compare/3219954a91cc01bf5df97d193ea83baa389809e3...833c12980a415747e0c68b4666c903901f1d537d
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/20221021/1c2b1462/attachment.htm>
More information about the pkg-java-commits
mailing list