Merge remote-tracking branch 'origin/staging' into 2024.05.0
This commit is contained in:
commit
4cdb81c77d
2 changed files with 15 additions and 1 deletions
|
@ -24,9 +24,10 @@ COPY --from=stagex/openssl . /
|
|||
COPY --from=stagex/perl . /
|
||||
RUN tar -xf ca-certificates-${SRC_2_VERSION}.tar.gz
|
||||
WORKDIR ca-certificates-${SRC_2_VERSION}
|
||||
ADD *.patch .
|
||||
RUN --network=none <<-EOF
|
||||
set -eux
|
||||
|
||||
patch -p1 < remove-timestamp.patch
|
||||
rm -f ./certdata.txt
|
||||
mv ../certdata.txt ./certdata.txt
|
||||
make
|
||||
|
|
13
packages/ca-certificates/remove-timestamp.patch
Normal file
13
packages/ca-certificates/remove-timestamp.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git a/mk-ca-bundle.pl b/mk-ca-bundle.pl
|
||||
index 926478f..51db464 100644
|
||||
--- a/mk-ca-bundle.pl
|
||||
+++ b/mk-ca-bundle.pl
|
||||
@@ -407,8 +407,6 @@ print CRT <<EOT;
|
||||
##
|
||||
## Bundle of CA Root Certificates
|
||||
##
|
||||
-## Certificate data from Mozilla ${datesrc}: ${currentdate} GMT
|
||||
-##
|
||||
## This is a bundle of X.509 certificates of public Certificate Authorities
|
||||
## (CA). These were automatically extracted from Mozilla's root certificates
|
||||
## file (certdata.txt). This file can be found in the mozilla source tree:
|
Loading…
Reference in a new issue