github-personal/labca
1
0
Fork 0
mirror of https://github.com/outbackdingo/labca.git synced 2026-01-27 10:19:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump boulder version to release-2023-12-04

Browse Source
This commit is contained in:
Arjan H
2023-12-09 14:39:50 +01:00
parent 9aa6fa3eb9
commit 88899cbd67
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/build.sh
View File

@@ -8,7 +8,7 @@ TMP_DIR=$(pwd)/tmp
rm -rf $TMP_DIR && mkdir -p $TMP_DIR/{admin,bin,logs,src}
boulderDir=$TMP_DIR/src
boulderTag="release-2023-11-20"
boulderTag="release-2023-12-04"
boulderUrl="https://github.com/letsencrypt/boulder/"
cloneDir=$(pwd)/..

2
install
View File

@@ -30,7 +30,7 @@ dockerComposeVersion="v2.5.0"
labcaUrl="https://github.com/hakwerk/labca/"
boulderUrl="https://github.com/letsencrypt/boulder/"
boulderTag="release-2023-11-20"
boulderTag="release-2023-12-04"
# Feature flags
flag_skip_redis=true

2
patch.sh
View File

@@ -34,7 +34,7 @@ $SUDO patch -p1 < $cloneDir/patches/expiration-mailer_main.patch
$SUDO patch -p1 < $cloneDir/patches/linter_linter.patch
$SUDO patch -p1 < $cloneDir/patches/log_prod_prefix.patch
$SUDO patch -p1 < $cloneDir/patches/log_test_prefix.patch
$SUDO patch -p1 < $cloneDir/patches/log-validator_main.patch
$SUDO patch -p1 < $cloneDir/patches/log_validator_validator.patch
$SUDO patch -p1 < $cloneDir/patches/mail_mailer.patch
$SUDO patch -p1 < $cloneDir/patches/makefile.patch
$SUDO patch -p1 < $cloneDir/patches/notify-mailer_main.patch

4
patches/ca_crl.patch
View File

@@ -1,5 +1,5 @@
diff --git a/ca/crl.go b/ca/crl.go
index adb311f1..88dcdc71 100644
index 10cbde3e2..91db977c4 100644
--- a/ca/crl.go
+++ b/ca/crl.go
@@ -117,7 +117,7 @@ func (ci *crlImpl) GenerateCRL(stream capb.CRLGenerator_GenerateCRLServer) error
@@ -24,7 +24,7 @@ index adb311f1..88dcdc71 100644
}
template.RevokedCertificateEntries = rcs
@@ -246,14 +248,14 @@ type issuingDistributionPoint struct {
@@ -247,14 +249,14 @@ type issuingDistributionPoint struct {
// makeIDPExt returns a critical IssuingDistributionPoint extension containing a
// URI built from the base url, the issuer's NameID, and the shard number. It
// also sets the OnlyContainsUserCerts boolean to true.

15
patches/log-validator_main.patch
View File

@@ -1,15 +0,0 @@
diff --git a/cmd/log-validator/main.go b/cmd/log-validator/main.go
index 80b72f997..72efc69bc 100644
--- a/cmd/log-validator/main.go
+++ b/cmd/log-validator/main.go
@@ -64,8 +64,8 @@ func lineValid(text string) error {
if strings.Contains(text, errorPrefix) {
return nil
}
- // Check the extracted checksum against the computed checksum
- if computedChecksum := blog.LogLineChecksum(line); checksum != computedChecksum {
+ // Check the extracted checksum against the computed checksum, but ignore "message repeated X times" lines
+ if computedChecksum := blog.LogLineChecksum(line); checksum != computedChecksum && checksum != "message" {
return fmt.Errorf("%s invalid checksum (expected %q, got %q)", errorPrefix, computedChecksum, checksum)
}
return nil

15
patches/log_validator_validator.patch Normal file
View File

@@ -0,0 +1,15 @@
diff --git a/log/validator/validator.go b/log/validator/validator.go
index a73330cb3..a5a752063 100644
--- a/log/validator/validator.go
+++ b/log/validator/validator.go
@@ -203,8 +203,8 @@ func lineValid(text string) error {
if strings.Contains(text, errorPrefix) {
return nil
}
- // Check the extracted checksum against the computed checksum
- if computedChecksum := log.LogLineChecksum(line); checksum != computedChecksum {
+ // Check the extracted checksum against the computed checksum, but ignore "message repeated X times" lines
+ if computedChecksum := log.LogLineChecksum(line); checksum != computedChecksum && checksum != "message" {
return fmt.Errorf("%s invalid checksum (expected %q, got %q)", errorPrefix, computedChecksum, checksum)
}
return nil

4
patches/ra_ra.patch
View File

@@ -1,5 +1,5 @@
diff --git a/ra/ra.go b/ra/ra.go
index 611a32fd1..4e621ec5e 100644
index 3c2fb694b..1b7343dc8 100644
--- a/ra/ra.go
+++ b/ra/ra.go
@@ -44,7 +44,6 @@ import (
@@ -10,7 +10,7 @@ index 611a32fd1..4e621ec5e 100644
"github.com/letsencrypt/boulder/probs"
pubpb "github.com/letsencrypt/boulder/publisher/proto"
rapb "github.com/letsencrypt/boulder/ra/proto"
@@ -562,7 +561,7 @@ func (ra *RegistrationAuthorityImpl) validateContacts(contacts []string) error {
@@ -560,7 +559,7 @@ func (ra *RegistrationAuthorityImpl) validateContacts(contacts []string) error {
contact,
)
}

4
patches/updater_updater.patch
View File

@@ -1,8 +1,8 @@
diff --git a/crl/updater/updater.go b/crl/updater/updater.go
index b7f4d4d6e..0d2f0c282 100644
index fec242794..ecda37738 100644
--- a/crl/updater/updater.go
+++ b/crl/updater/updater.go
@@ -234,7 +234,7 @@ func (cu *crlUpdater) updateShard(ctx context.Context, atTime time.Time, issuerN
@@ -231,7 +231,7 @@ func (cu *crlUpdater) updateShard(ctx context.Context, atTime time.Time, issuerN
crlEntries = append(crlEntries, entry)
}