From 30085b15eed954f165d2f53863546a7092057b73 Mon Sep 17 00:00:00 2001
From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
Date: Wed, 5 Jul 2023 21:07:49 +0000
Subject: [PATCH 1/2] zookeeper/3.8.2-0 package update

---
 zookeeper.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zookeeper.yaml b/zookeeper.yaml
index 188800919020..39191bb70015 100644
--- a/zookeeper.yaml
+++ b/zookeeper.yaml
@@ -1,8 +1,8 @@
 package:
   name: zookeeper
   # When bumping, check to see if the CVE mitigations below can be removed.
-  version: "3.8.1"
-  epoch: 2
+  version: 3.8.2-0
+  epoch: 0
   description:
   target-architecture:
     - all
@@ -31,7 +31,7 @@ pipeline:
     with:
       repository: https://github.com/apache/zookeeper
       tag: release-${{package.version}}
-      expected-commit: 74db005175a4ec545697012f9069cb9dcc8cdda7
+      expected-commit: 139d619b58292d7734b4fc83a0f44be4e7b0c986
 
   - runs: |
       export LANG=en_US.UTF-8

From 695e912ce6cb1cd3dc7a9df002fb20141f478bdc Mon Sep 17 00:00:00 2001
From: James Rawlings <jrawlings@chainguard.dev>
Date: Thu, 6 Jul 2023 09:45:22 +0100
Subject: [PATCH 2/2] fix zookeeper build as upstream sometimes adds a fourth
 digit to the release version

also remove patch to mitigate CVE-2023-26048 and CVE-2023-26049 as Jetty has been upgraded upstream [here](https://github.com/apache/zookeeper/blob/139d619b58292d7734b4fc83a0f44be4e7b0c986/pom.xml#L471)

Signed-off-by: James Rawlings <jrawlings@chainguard.dev>
---
 zookeeper.yaml | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/zookeeper.yaml b/zookeeper.yaml
index 39191bb70015..af9ecf71b96a 100644
--- a/zookeeper.yaml
+++ b/zookeeper.yaml
@@ -1,7 +1,6 @@
 package:
   name: zookeeper
-  # When bumping, check to see if the CVE mitigations below can be removed.
-  version: 3.8.2-0
+  version: 3.8.2.0
   epoch: 0
   description:
   target-architecture:
@@ -16,6 +15,16 @@ package:
       - bash # some helper scripts use bash
       - openjdk-17-default-jvm
 
+var-transforms:
+  - from: ${{package.version}}
+    match: \.(\d+)$
+    replace: "-$1"
+    to: mangled-package-version
+  - from: ${{package.version}}
+    match: ^(\d+\.\d+\.\d+)\.\d+$
+    replace: "$1"
+    to: short-package-version
+
 environment:
   contents:
     packages:
@@ -30,18 +39,15 @@ pipeline:
   - uses: git-checkout
     with:
       repository: https://github.com/apache/zookeeper
-      tag: release-${{package.version}}
+      tag: release-${{vars.mangled-package-version}}
       expected-commit: 139d619b58292d7734b4fc83a0f44be4e7b0c986
 
   - runs: |
       export LANG=en_US.UTF-8
       export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
 
-      # Mitigate CVE-2023-26048 and CVE-2023-26049 by bumping jetty
-      sed -i 's/\(<jetty.version>\)[^<]\+/\19.4.51.v20230217/' pom.xml
-
       mvn install -DskipTests
-      tar -xf zookeeper-assembly/target/apache-zookeeper-${{package.version}}-bin.tar.gz
+      tar -xf zookeeper-assembly/target/apache-zookeeper-${{vars.short-package-version}}-bin.tar.gz
 
       mkdir -p ${{targets.destdir}}/usr/share/java/zookeeper
       mkdir -p ${{targets.destdir}}/usr/share/java/zookeeper/bin
@@ -49,16 +55,17 @@ pipeline:
       mkdir -p ${{targets.destdir}}/usr/share/java/zookeeper/conf
 
       # Clean up windows files
-      rm -rf apache-zookeeper-${{package.version}}-bin/bin/*.cmd
-      mv apache-zookeeper-${{package.version}}-bin/lib/* ${{targets.destdir}}/usr/share/java/zookeeper/lib
-      mv apache-zookeeper-${{package.version}}-bin/bin/* ${{targets.destdir}}/usr/share/java/zookeeper/bin
-      mv apache-zookeeper-${{package.version}}-bin/conf/* ${{targets.destdir}}/usr/share/java/zookeeper/conf
+      rm -rf apache-zookeeper-${{vars.short-package-version}}-bin/bin/*.cmd
+      mv apache-zookeeper-${{vars.short-package-version}}-bin/lib/* ${{targets.destdir}}/usr/share/java/zookeeper/lib
+      mv apache-zookeeper-${{vars.short-package-version}}-bin/bin/* ${{targets.destdir}}/usr/share/java/zookeeper/bin
+      mv apache-zookeeper-${{vars.short-package-version}}-bin/conf/* ${{targets.destdir}}/usr/share/java/zookeeper/conf
 
       # Setup a sample conf
       cp ${{targets.destdir}}/usr/share/java/zookeeper/conf/zoo_sample.cfg ${{targets.destdir}}/usr/share/java/zookeeper/conf/zoo.cfg
 
 update:
   enabled: true
+  version-separator: "-"
   github:
     tag-filter: release-
     identifier: apache/zookeeper