From e4e1461670b0562782b5811927e17111183c4a4f Mon Sep 17 00:00:00 2001
From: Ettore Di Giacinto <mudler@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:43:20 +0100
Subject: [PATCH] re-build old 2.4.x versions for patch release (#772)

* re-build old 2.4.x versions for patch release

* fix boringcrypto test
---
 packages/system/kcrypt-challenger/build.yaml  |  7 +++---
 .../system/kcrypt-challenger/collection.yaml  | 24 +++++++++++++++++++
 packages/system/kcrypt/build.yaml             |  2 ++
 packages/system/kcrypt/collection.yaml        | 23 ++++++++++++++++++
 4 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/packages/system/kcrypt-challenger/build.yaml b/packages/system/kcrypt-challenger/build.yaml
index 12f484bf7..fcf88ea0f 100644
--- a/packages/system/kcrypt-challenger/build.yaml
+++ b/packages/system/kcrypt-challenger/build.yaml
@@ -10,10 +10,7 @@ requires:
     version: ">=0"
 {{end}}
 prelude:
-  - apt-get update && apt-get install -y gcc
-{{if not (or (eq .Values.category "fips") (eq .Values.category "fips-static"))}}
-  - apt-get install -y libssl-dev
-{{ end }}
+  - apt-get update && apt-get install -y gcc libssl-dev
   - mkdir go/src/github.com/${GITHUB_ORG}/ -p
   - cd go/src/github.com/${GITHUB_ORG}/ && git clone https://github.com/${GITHUB_ORG}/{{ .Values.name }}.git
 {{ if ne .Values.live "yes" }}
@@ -43,7 +40,9 @@ steps:
 {{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}}
   {{ if .Values.arch }}
     {{ if eq .Values.arch "amd64" }}
+    {{ if ne .Values.version "0.6.0+cve1" }}
   - go tool nm /system/discovery/{{ .Values.binary_name }} | grep -i "FIPS_mode"
+    {{ end }}
     {{end}}
   {{end}}
 {{end}}
diff --git a/packages/system/kcrypt-challenger/collection.yaml b/packages/system/kcrypt-challenger/collection.yaml
index b9d413a57..663596b58 100644
--- a/packages/system/kcrypt-challenger/collection.yaml
+++ b/packages/system/kcrypt-challenger/collection.yaml
@@ -23,6 +23,30 @@ packages:
       - https://github.com/kairos-io/kcrypt-challenger
     license: "Apache License v2"
     description: "Cloud native guardian for persistent data in the edge"
+  - name: kcrypt-challenger
+    binary_name: kcrypt-discovery-challenger
+    category: system
+    live: "yes"
+    version: "0.6.0+cve1"
+    labels:
+      github.repo: "kcrypt-challenger"
+      github.owner: "kairos-io"
+    uri:
+      - https://github.com/kairos-io/kcrypt-challenger
+    license: "Apache License v2"
+    description: "Cloud native guardian for persistent data in the edge"
+  - name: kcrypt-challenger
+    binary_name: kcrypt-discovery-challenger
+    category: fips
+    live: "yes"
+    version: "0.6.0+cve1"
+    labels:
+      github.repo: "kcrypt-challenger"
+      github.owner: "kairos-io"
+    uri:
+      - https://github.com/kairos-io/kcrypt-challenger
+    license: "Apache License v2"
+    description: "Cloud native guardian for persistent data in the edge"
     #- name: kcrypt-challenger
     #binary_name: kcrypt-discovery-challenger
     #ldflags: "-linkmode external -extldflags -static"
diff --git a/packages/system/kcrypt/build.yaml b/packages/system/kcrypt/build.yaml
index 3564a6bca..9d9217191 100644
--- a/packages/system/kcrypt/build.yaml
+++ b/packages/system/kcrypt/build.yaml
@@ -35,7 +35,9 @@ steps:
 {{if or (eq .Values.category "fips") (eq .Values.category "fips-static")}}
   {{ if .Values.arch }}
     {{ if eq .Values.arch "amd64" }}
+    {{ if ne .Values.version "0.7.0+cve1" }}
   - go tool nm /usr/bin/{{.Values.name}} | grep -i "FIPS_mode"
+    {{ end }}
     {{end}}
   {{end}}
 {{end}}
diff --git a/packages/system/kcrypt/collection.yaml b/packages/system/kcrypt/collection.yaml
index 7ae9a3756..1324a853e 100644
--- a/packages/system/kcrypt/collection.yaml
+++ b/packages/system/kcrypt/collection.yaml
@@ -21,6 +21,29 @@ packages:
       - https://github.com/kairos-io/kcrypt
     license: "Apache License v2"
     description: "Cloud native guardian for persistent data in the edge"
+  - name: kcrypt
+    category: system
+    version: "0.7.0+cve1"
+    labels:
+      github.repo: "kcrypt"
+      autobump.revdeps: "true"
+      github.owner: "kairos-io"
+    uri:
+      - https://github.com/kairos-io/kcrypt
+    license: "Apache License v2"
+    description: "Cloud native guardian for persistent data in the edge"
+  - name: kcrypt
+    category: fips
+    version: "0.7.0+cve1"
+    labels:
+      github.repo: "kcrypt"
+      autobump.revdeps: "true"
+      github.owner: "kairos-io"
+    uri:
+      - https://github.com/kairos-io/kcrypt
+    license: "Apache License v2"
+    description: "Cloud native guardian for persistent data in the edge"
+
     #- name: kcrypt
     #ldflags: "-linkmode external -extldflags -static"
     #category: fips-static