From 46c92f79d39330d50ecad7986b2bbcb091c24aad Mon Sep 17 00:00:00 2001
From: Arjan H <github@hakwerk.com>
Date: Wed, 7 Sep 2022 19:48:56 +0200
Subject: [PATCH] Bump boulder version to release-2022-09-06

---
 gui/dashboard.go             | 12 ++++++------
 install                      |  2 +-
 patches/docker-compose.patch |  6 +++---
 patches/storer_storer.patch  |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gui/dashboard.go b/gui/dashboard.go
index db6c098..330a14a 100644
--- a/gui/dashboard.go
+++ b/gui/dashboard.go
@@ -50,17 +50,17 @@ func _parseLine(line string, loc *time.Location) Activity {
 
 	line = _removeAnsiColors(line)
 
-	re := regexp.MustCompile(`^.*\|\s*(\S+) (\S) (\S+) (\S+) (.*)$`)
+	re := regexp.MustCompile(`^.*\|\s*(\S+)(.*\:)? (\S) (\S+) (\S+) (.*)$`)
 	result := re.FindStringSubmatch(line)
 	if len(result) == 0 {
 		return activity
 	}
 
 	activity.Class = ""
-	if result[2] == "4" {
+	if result[3] == "4" {
 		activity.Class = "warning"
 	}
-	if result[2] == "3" {
+	if result[3] == "3" {
 		activity.Class = "error"
 	}
 
@@ -74,8 +74,8 @@ func _parseLine(line string, loc *time.Location) Activity {
 	}
 
 	activity.Title = ""
-	if len(result[3]) > 2 {
-		tail := result[3][len(result[3])-2:]
+	if len(result[4]) > 2 {
+		tail := result[4][len(result[4])-2:]
 		switch tail {
 		case "ca":
 			activity.Title = "Certification Agent"
@@ -88,7 +88,7 @@ func _parseLine(line string, loc *time.Location) Activity {
 		}
 	}
 
-	message := result[5]
+	message := result[6]
 	idx := strings.Index(message, ".well-known/acme-challenge")
 	if idx > -1 {
 		message = message[0:idx]
diff --git a/install b/install
index 8d1c3c1..c4c4962 100755
--- a/install
+++ b/install
@@ -24,7 +24,7 @@ dockerComposeVersion="v2.5.0"
 
 labcaUrl="https://github.com/hakwerk/labca/"
 boulderUrl="https://github.com/letsencrypt/boulder/"
-boulderTag="release-2022-08-29"
+boulderTag="release-2022-09-06"
 
 # Feature flags
 flag_skip_redis=true
diff --git a/patches/docker-compose.patch b/patches/docker-compose.patch
index 35c5c59..38f1931 100644
--- a/patches/docker-compose.patch
+++ b/patches/docker-compose.patch
@@ -104,9 +104,9 @@ index 0cd8c8dd..36619190 100644
 +  control:
      image: *boulder_image
 -    environment:
--        GO111MODULE: "on"
--        GOFLAGS: -mod=vendor
--        BOULDER_CONFIG_DIR: test/config
+-      GO111MODULE: "on"
+-      GOFLAGS: -mod=vendor
+-      BOULDER_CONFIG_DIR: test/config
      networks:
        - bluenet
      volumes:
diff --git a/patches/storer_storer.patch b/patches/storer_storer.patch
index c3477ac..8786935 100644
--- a/patches/storer_storer.patch
+++ b/patches/storer_storer.patch
@@ -63,7 +63,7 @@ index 859abc9f..749b3818 100644
 +		err = storeLocalFile(cs.localStorePath, issuer.NameID(), crlNumber, shardIdx, bytes.NewReader(crlBytes))
 +	}
  	if err != nil {
- 		cs.uploadCount.WithLabelValues(issuer.Subject.CommonName, "failed")
+ 		cs.uploadCount.WithLabelValues(issuer.Subject.CommonName, "failed").Inc()
  		cs.log.AuditErrf("CRL upload failed: id=[%s] err=[%s]", crlId, err)
 @@ -189,3 +199,46 @@ func (cs *crlStorer) UploadCRL(stream cspb.CRLStorer_UploadCRLServer) error {