git: f182d0c7e87a - stable/12 - caroot: drop $FreeBSD$ expansion from root bundle

Kyle Evans kevans at FreeBSD.org
Sat Jan 2 05:40:16 UTC 2021 

The branch stable/12 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=f182d0c7e87a5164c3b4f4940c0882dc58481de5

commit f182d0c7e87a5164c3b4f4940c0882dc58481de5
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2020-12-28 03:47:41 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-01-02 05:40:03 +0000

    caroot: drop $FreeBSD$ expansion from root bundle
    
    This debatably could have waited until the next update would have taken
    place, but it's easier to see what changes if we get it out of the way
    now.
    
    (cherry picked from commit f20c0e3319524d51ab474608851bc705d57a7482)
---
 secure/caroot/trusted/ACCVRAIZ1.pem                                     | 2 +-
 secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem                              | 2 +-
 secure/caroot/trusted/Actalis_Authentication_Root_CA.pem                | 2 +-
 secure/caroot/trusted/AffirmTrust_Commercial.pem                        | 2 +-
 secure/caroot/trusted/AffirmTrust_Networking.pem                        | 2 +-
 secure/caroot/trusted/AffirmTrust_Premium.pem                           | 2 +-
 secure/caroot/trusted/AffirmTrust_Premium_ECC.pem                       | 2 +-
 secure/caroot/trusted/Amazon_Root_CA_1.pem                              | 2 +-
 secure/caroot/trusted/Amazon_Root_CA_2.pem                              | 2 +-
 secure/caroot/trusted/Amazon_Root_CA_3.pem                              | 2 +-
 secure/caroot/trusted/Amazon_Root_CA_4.pem                              | 2 +-
 secure/caroot/trusted/Atos_TrustedRoot_2011.pem                         | 2 +-
 .../Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem       | 2 +-
 secure/caroot/trusted/Baltimore_CyberTrust_Root.pem                     | 2 +-
 secure/caroot/trusted/Buypass_Class_2_Root_CA.pem                       | 2 +-
 secure/caroot/trusted/Buypass_Class_3_Root_CA.pem                       | 2 +-
 secure/caroot/trusted/CA_Disig_Root_R2.pem                              | 2 +-
 secure/caroot/trusted/CFCA_EV_ROOT.pem                                  | 2 +-
 secure/caroot/trusted/COMODO_Certification_Authority.pem                | 2 +-
 secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem            | 2 +-
 secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem            | 2 +-
 secure/caroot/trusted/Camerfirma_Chambers_of_Commerce_Root.pem          | 2 +-
 secure/caroot/trusted/Camerfirma_Global_Chambersign_Root.pem            | 2 +-
 secure/caroot/trusted/Certigna.pem                                      | 2 +-
 secure/caroot/trusted/Certigna_Root_CA.pem                              | 2 +-
 secure/caroot/trusted/Certum_Root_CA.pem                                | 2 +-
 secure/caroot/trusted/Certum_Trusted_Network_CA.pem                     | 2 +-
 secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem                   | 2 +-
 secure/caroot/trusted/Chambers_of_Commerce_Root_-_2008.pem              | 2 +-
 secure/caroot/trusted/Comodo_AAA_Services_root.pem                      | 2 +-
 secure/caroot/trusted/Cybertrust_Global_Root.pem                        | 2 +-
 secure/caroot/trusted/D-TRUST_Root_CA_3_2013.pem                        | 2 +-
 secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem                | 2 +-
 secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem             | 2 +-
 secure/caroot/trusted/DST_Root_CA_X3.pem                                | 2 +-
 secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem                   | 2 +-
 secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem                   | 2 +-
 secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem                   | 2 +-
 secure/caroot/trusted/DigiCert_Global_Root_CA.pem                       | 2 +-
 secure/caroot/trusted/DigiCert_Global_Root_G2.pem                       | 2 +-
 secure/caroot/trusted/DigiCert_Global_Root_G3.pem                       | 2 +-
 secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem            | 2 +-
 secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem                      | 2 +-
 secure/caroot/trusted/E-Tugra_Certification_Authority.pem               | 2 +-
 secure/caroot/trusted/EC-ACC.pem                                        | 2 +-
 secure/caroot/trusted/Entrust_Root_Certification_Authority.pem          | 2 +-
 secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem    | 2 +-
 secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem     | 2 +-
 secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem     | 2 +-
 secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem     | 2 +-
 secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem                        | 2 +-
 secure/caroot/trusted/GTS_Root_R1.pem                                   | 2 +-
 secure/caroot/trusted/GTS_Root_R2.pem                                   | 2 +-
 secure/caroot/trusted/GTS_Root_R3.pem                                   | 2 +-
 secure/caroot/trusted/GTS_Root_R4.pem                                   | 2 +-
 secure/caroot/trusted/GeoTrust_Primary_Certification_Authority_-_G2.pem | 2 +-
 secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem                   | 2 +-
 secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem                   | 2 +-
 secure/caroot/trusted/GlobalSign_Root_CA.pem                            | 2 +-
 secure/caroot/trusted/GlobalSign_Root_CA_-_R2.pem                       | 2 +-
 secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem                       | 2 +-
 secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem                       | 2 +-
 secure/caroot/trusted/Global_Chambersign_Root_-_2008.pem                | 2 +-
 secure/caroot/trusted/Go_Daddy_Class_2_CA.pem                           | 2 +-
 secure/caroot/trusted/Go_Daddy_Root_Certificate_Authority_-_G2.pem      | 2 +-
 .../Hellenic_Academic_and_Research_Institutions_ECC_RootCA_2015.pem     | 2 +-
 .../trusted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem | 2 +-
 .../trusted/Hellenic_Academic_and_Research_Institutions_RootCA_2015.pem | 2 +-
 secure/caroot/trusted/Hongkong_Post_Root_CA_1.pem                       | 2 +-
 secure/caroot/trusted/Hongkong_Post_Root_CA_3.pem                       | 2 +-
 secure/caroot/trusted/ISRG_Root_X1.pem                                  | 2 +-
 secure/caroot/trusted/IdenTrust_Commercial_Root_CA_1.pem                | 2 +-
 secure/caroot/trusted/IdenTrust_Public_Sector_Root_CA_1.pem             | 2 +-
 secure/caroot/trusted/Izenpe_com.pem                                    | 2 +-
 secure/caroot/trusted/Microsec_e-Szigno_Root_CA_2009.pem                | 2 +-
 secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem | 2 +-
 secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem | 2 +-
 secure/caroot/trusted/NAVER_Global_Root_Certification_Authority.pem     | 2 +-
 secure/caroot/trusted/NetLock_Arany__Class_Gold__F__tan__s__tv__ny.pem  | 2 +-
 secure/caroot/trusted/Network_Solutions_Certificate_Authority.pem       | 2 +-
 secure/caroot/trusted/OISTE_WISeKey_Global_Root_GA_CA.pem               | 2 +-
 secure/caroot/trusted/OISTE_WISeKey_Global_Root_GB_CA.pem               | 2 +-
 secure/caroot/trusted/OISTE_WISeKey_Global_Root_GC_CA.pem               | 2 +-
 secure/caroot/trusted/QuoVadis_Root_CA.pem                              | 2 +-
 secure/caroot/trusted/QuoVadis_Root_CA_1_G3.pem                         | 2 +-
 secure/caroot/trusted/QuoVadis_Root_CA_2.pem                            | 2 +-
 secure/caroot/trusted/QuoVadis_Root_CA_2_G3.pem                         | 2 +-
 secure/caroot/trusted/QuoVadis_Root_CA_3.pem                            | 2 +-
 secure/caroot/trusted/QuoVadis_Root_CA_3_G3.pem                         | 2 +-
 secure/caroot/trusted/SSL_com_EV_Root_Certification_Authority_ECC.pem   | 2 +-
 .../caroot/trusted/SSL_com_EV_Root_Certification_Authority_RSA_R2.pem   | 2 +-
 secure/caroot/trusted/SSL_com_Root_Certification_Authority_ECC.pem      | 2 +-
 secure/caroot/trusted/SSL_com_Root_Certification_Authority_RSA.pem      | 2 +-
 secure/caroot/trusted/SZAFIR_ROOT_CA2.pem                               | 2 +-
 secure/caroot/trusted/SecureSign_RootCA11.pem                           | 2 +-
 secure/caroot/trusted/SecureTrust_CA.pem                                | 2 +-
 secure/caroot/trusted/Secure_Global_CA.pem                              | 2 +-
 secure/caroot/trusted/Security_Communication_RootCA2.pem                | 2 +-
 secure/caroot/trusted/Security_Communication_Root_CA.pem                | 2 +-
 secure/caroot/trusted/Sonera_Class_2_Root_CA.pem                        | 2 +-
 secure/caroot/trusted/Staat_der_Nederlanden_EV_Root_CA.pem              | 2 +-
 secure/caroot/trusted/Staat_der_Nederlanden_Root_CA_-_G3.pem            | 2 +-
 secure/caroot/trusted/Starfield_Class_2_CA.pem                          | 2 +-
 secure/caroot/trusted/Starfield_Root_Certificate_Authority_-_G2.pem     | 2 +-
 .../trusted/Starfield_Services_Root_Certificate_Authority_-_G2.pem      | 2 +-
 secure/caroot/trusted/SwissSign_Gold_CA_-_G2.pem                        | 2 +-
 secure/caroot/trusted/SwissSign_Platinum_CA_-_G2.pem                    | 2 +-
 secure/caroot/trusted/SwissSign_Silver_CA_-_G2.pem                      | 2 +-
 .../Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem    | 2 +-
 .../Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem    | 2 +-
 secure/caroot/trusted/T-TeleSec_GlobalRoot_Class_2.pem                  | 2 +-
 secure/caroot/trusted/T-TeleSec_GlobalRoot_Class_3.pem                  | 2 +-
 secure/caroot/trusted/TUBITAK_Kamu_SM_SSL_Kok_Sertifikasi_-_Surum_1.pem | 2 +-
 secure/caroot/trusted/TWCA_Global_Root_CA.pem                           | 2 +-
 secure/caroot/trusted/TWCA_Root_Certification_Authority.pem             | 2 +-
 secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem                        | 2 +-
 secure/caroot/trusted/TrustCor_ECA-1.pem                                | 2 +-
 secure/caroot/trusted/TrustCor_RootCert_CA-1.pem                        | 2 +-
 secure/caroot/trusted/TrustCor_RootCert_CA-2.pem                        | 2 +-
 secure/caroot/trusted/Trustis_FPS_Root_CA.pem                           | 2 +-
 secure/caroot/trusted/Trustwave_Global_Certification_Authority.pem      | 2 +-
 .../trusted/Trustwave_Global_ECC_P256_Certification_Authority.pem       | 2 +-
 .../trusted/Trustwave_Global_ECC_P384_Certification_Authority.pem       | 2 +-
 secure/caroot/trusted/UCA_Extended_Validation_Root.pem                  | 2 +-
 secure/caroot/trusted/UCA_Global_G2_Root.pem                            | 2 +-
 secure/caroot/trusted/USERTrust_ECC_Certification_Authority.pem         | 2 +-
 secure/caroot/trusted/USERTrust_RSA_Certification_Authority.pem         | 2 +-
 .../caroot/trusted/VeriSign_Universal_Root_Certification_Authority.pem  | 2 +-
 .../Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem    | 2 +-
 .../Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem    | 2 +-
 secure/caroot/trusted/XRamp_Global_CA_Root.pem                          | 2 +-
 secure/caroot/trusted/certSIGN_ROOT_CA.pem                              | 2 +-
 secure/caroot/trusted/certSIGN_Root_CA_G2.pem                           | 2 +-
 secure/caroot/trusted/e-Szigno_Root_CA_2017.pem                         | 2 +-
 secure/caroot/trusted/ePKI_Root_Certification_Authority.pem             | 2 +-
 secure/caroot/trusted/emSign_ECC_Root_CA_-_C3.pem                       | 2 +-
 secure/caroot/trusted/emSign_ECC_Root_CA_-_G3.pem                       | 2 +-
 secure/caroot/trusted/emSign_Root_CA_-_C1.pem                           | 2 +-
 secure/caroot/trusted/emSign_Root_CA_-_G1.pem                           | 2 +-
 139 files changed, 139 insertions(+), 139 deletions(-)

diff --git a/secure/caroot/trusted/ACCVRAIZ1.pem b/secure/caroot/trusted/ACCVRAIZ1.pem
index 136f7bddb6f3..0c7c7c41b57d 100644
--- a/secure/caroot/trusted/ACCVRAIZ1.pem
+++ b/secure/caroot/trusted/ACCVRAIZ1.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem
index d327b3ecf2cb..579f50d8d730 100644
--- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem
+++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem
index 6e7823d4b81f..7248545350e2 100644
--- a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem
+++ b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/AffirmTrust_Commercial.pem b/secure/caroot/trusted/AffirmTrust_Commercial.pem
index e0a8ebdf12e1..1d85c32853c8 100644
--- a/secure/caroot/trusted/AffirmTrust_Commercial.pem
+++ b/secure/caroot/trusted/AffirmTrust_Commercial.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/AffirmTrust_Networking.pem b/secure/caroot/trusted/AffirmTrust_Networking.pem
index a96b036f4153..222bde26c934 100644
--- a/secure/caroot/trusted/AffirmTrust_Networking.pem
+++ b/secure/caroot/trusted/AffirmTrust_Networking.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/AffirmTrust_Premium.pem b/secure/caroot/trusted/AffirmTrust_Premium.pem
index ee259e197476..dc1447429465 100644
--- a/secure/caroot/trusted/AffirmTrust_Premium.pem
+++ b/secure/caroot/trusted/AffirmTrust_Premium.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem
index 5f600162a941..a6f01409a2ef 100644
--- a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem
+++ b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Amazon_Root_CA_1.pem b/secure/caroot/trusted/Amazon_Root_CA_1.pem
index 9221de0cea44..6bf1acafd4c7 100644
--- a/secure/caroot/trusted/Amazon_Root_CA_1.pem
+++ b/secure/caroot/trusted/Amazon_Root_CA_1.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Amazon_Root_CA_2.pem b/secure/caroot/trusted/Amazon_Root_CA_2.pem
index 418ffc0b8de0..80a1eb66bee2 100644
--- a/secure/caroot/trusted/Amazon_Root_CA_2.pem
+++ b/secure/caroot/trusted/Amazon_Root_CA_2.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Amazon_Root_CA_3.pem b/secure/caroot/trusted/Amazon_Root_CA_3.pem
index 36ff13dc4708..6b61b3e18fa0 100644
--- a/secure/caroot/trusted/Amazon_Root_CA_3.pem
+++ b/secure/caroot/trusted/Amazon_Root_CA_3.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Amazon_Root_CA_4.pem b/secure/caroot/trusted/Amazon_Root_CA_4.pem
index c1f88d6bc8a3..df7aa6f1c165 100644
--- a/secure/caroot/trusted/Amazon_Root_CA_4.pem
+++ b/secure/caroot/trusted/Amazon_Root_CA_4.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem
index 3f038d3c239c..21b229561733 100644
--- a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem
+++ b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem
index da12de780be6..4d2eaa61962f 100644
--- a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem
+++ b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem b/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem
index cc5d711bc08d..3dc1de849346 100644
--- a/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem
+++ b/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem b/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem
index 5ebb2edfcf84..dc2c86edbed1 100644
--- a/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem
+++ b/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem b/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem
index 1aab9dec0adc..fda39f8731d1 100644
--- a/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem
+++ b/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/CA_Disig_Root_R2.pem b/secure/caroot/trusted/CA_Disig_Root_R2.pem
index a6db02606c5d..0ecc9d1ee08d 100644
--- a/secure/caroot/trusted/CA_Disig_Root_R2.pem
+++ b/secure/caroot/trusted/CA_Disig_Root_R2.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/CFCA_EV_ROOT.pem b/secure/caroot/trusted/CFCA_EV_ROOT.pem
index 460785cc21e6..7eb37baa3bed 100644
--- a/secure/caroot/trusted/CFCA_EV_ROOT.pem
+++ b/secure/caroot/trusted/CFCA_EV_ROOT.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/COMODO_Certification_Authority.pem b/secure/caroot/trusted/COMODO_Certification_Authority.pem
index f6c1cb232ac6..7aa1237bb8e1 100644
--- a/secure/caroot/trusted/COMODO_Certification_Authority.pem
+++ b/secure/caroot/trusted/COMODO_Certification_Authority.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem b/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem
index 322154206039..215581b14fdf 100644
--- a/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem
+++ b/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem b/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem
index 53c540ff2146..38e275f1365e 100644
--- a/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem
+++ b/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Camerfirma_Chambers_of_Commerce_Root.pem b/secure/caroot/trusted/Camerfirma_Chambers_of_Commerce_Root.pem
index 601df8f89e10..cf7de6cc122b 100644
--- a/secure/caroot/trusted/Camerfirma_Chambers_of_Commerce_Root.pem
+++ b/secure/caroot/trusted/Camerfirma_Chambers_of_Commerce_Root.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Camerfirma_Global_Chambersign_Root.pem b/secure/caroot/trusted/Camerfirma_Global_Chambersign_Root.pem
index 203fb13108c8..b1fa96bc405e 100644
--- a/secure/caroot/trusted/Camerfirma_Global_Chambersign_Root.pem
+++ b/secure/caroot/trusted/Camerfirma_Global_Chambersign_Root.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Certigna.pem b/secure/caroot/trusted/Certigna.pem
index 3a25f25160ea..bbcd413be511 100644
--- a/secure/caroot/trusted/Certigna.pem
+++ b/secure/caroot/trusted/Certigna.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Certigna_Root_CA.pem b/secure/caroot/trusted/Certigna_Root_CA.pem
index 564d3fe8f50d..c1a0286ab2a0 100644
--- a/secure/caroot/trusted/Certigna_Root_CA.pem
+++ b/secure/caroot/trusted/Certigna_Root_CA.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Certum_Root_CA.pem b/secure/caroot/trusted/Certum_Root_CA.pem
index ec03a0f913de..f815c49ddae0 100644
--- a/secure/caroot/trusted/Certum_Root_CA.pem
+++ b/secure/caroot/trusted/Certum_Root_CA.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Certum_Trusted_Network_CA.pem b/secure/caroot/trusted/Certum_Trusted_Network_CA.pem
index 5ced43da18d8..a321445a502c 100644
--- a/secure/caroot/trusted/Certum_Trusted_Network_CA.pem
+++ b/secure/caroot/trusted/Certum_Trusted_Network_CA.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem b/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem
index 0493c488801c..62cee7fc2058 100644
--- a/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem
+++ b/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Chambers_of_Commerce_Root_-_2008.pem b/secure/caroot/trusted/Chambers_of_Commerce_Root_-_2008.pem
index b705886574c8..1e3864180a66 100644
--- a/secure/caroot/trusted/Chambers_of_Commerce_Root_-_2008.pem
+++ b/secure/caroot/trusted/Chambers_of_Commerce_Root_-_2008.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Comodo_AAA_Services_root.pem b/secure/caroot/trusted/Comodo_AAA_Services_root.pem
index 5e2506239c66..3ab5ce74bc37 100644
--- a/secure/caroot/trusted/Comodo_AAA_Services_root.pem
+++ b/secure/caroot/trusted/Comodo_AAA_Services_root.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Cybertrust_Global_Root.pem b/secure/caroot/trusted/Cybertrust_Global_Root.pem
index 54647522233b..b6261df7f2df 100644
--- a/secure/caroot/trusted/Cybertrust_Global_Root.pem
+++ b/secure/caroot/trusted/Cybertrust_Global_Root.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/D-TRUST_Root_CA_3_2013.pem b/secure/caroot/trusted/D-TRUST_Root_CA_3_2013.pem
index ab9d138bd3e1..debf7b30c2ef 100644
--- a/secure/caroot/trusted/D-TRUST_Root_CA_3_2013.pem
+++ b/secure/caroot/trusted/D-TRUST_Root_CA_3_2013.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem
index a460f18db523..37b0f004ef94 100644
--- a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem
+++ b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem
index f270c37caa80..71d0f7fc323f 100644
--- a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem
+++ b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/DST_Root_CA_X3.pem b/secure/caroot/trusted/DST_Root_CA_X3.pem
index 47f5f3212169..aeaa167d590c 100644
--- a/secure/caroot/trusted/DST_Root_CA_X3.pem
+++ b/secure/caroot/trusted/DST_Root_CA_X3.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem b/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem
index f768b06d12db..12ce54725012 100644
--- a/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem
+++ b/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem b/secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem
index 0135f133c7ac..7c5d96a053e4 100644
--- a/secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem
+++ b/secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem b/secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem
index cdd8f0be47f5..901c33448725 100644
--- a/secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem
+++ b/secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/DigiCert_Global_Root_CA.pem b/secure/caroot/trusted/DigiCert_Global_Root_CA.pem
index 3a273557ab67..75c9fd45ebab 100644
--- a/secure/caroot/trusted/DigiCert_Global_Root_CA.pem
+++ b/secure/caroot/trusted/DigiCert_Global_Root_CA.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/DigiCert_Global_Root_G2.pem b/secure/caroot/trusted/DigiCert_Global_Root_G2.pem
index 7b80ce72c72e..363d93b2c9ac 100644
--- a/secure/caroot/trusted/DigiCert_Global_Root_G2.pem
+++ b/secure/caroot/trusted/DigiCert_Global_Root_G2.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/DigiCert_Global_Root_G3.pem b/secure/caroot/trusted/DigiCert_Global_Root_G3.pem
index 6538535dd73b..45776f544654 100644
--- a/secure/caroot/trusted/DigiCert_Global_Root_G3.pem
+++ b/secure/caroot/trusted/DigiCert_Global_Root_G3.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem b/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem
index dcb88fb3d1b4..d76acb3c3896 100644
--- a/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem
+++ b/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem b/secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem
index 92295c4ec38e..7ebb30081d81 100644
--- a/secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem
+++ b/secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem b/secure/caroot/trusted/E-Tugra_Certification_Authority.pem
index 256c0b3e524b..04d1e630a816 100644
--- a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem
+++ b/secure/caroot/trusted/E-Tugra_Certification_Authority.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/EC-ACC.pem b/secure/caroot/trusted/EC-ACC.pem
index 7fca8890028f..a4b43b39414b 100644
--- a/secure/caroot/trusted/EC-ACC.pem
+++ b/secure/caroot/trusted/EC-ACC.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem b/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem
index 2ed6ff3e94a2..50b0d2ed5c94 100644
--- a/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem
+++ b/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem
index ae0d6859b1d6..eb15c3801be6 100644
--- a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem
+++ b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem
index d82aaf71ecae..b92fd4aef90f 100644
--- a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem
+++ b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem
index a84b6ca03d42..8443ae5ca195 100644
--- a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem
+++ b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem b/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem
index 1d18cb8d6a4b..b429d96786ea 100644
--- a/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem
+++ b/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem b/secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem
index 59b80e1f45ce..f9db5d422b8e 100644
--- a/secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem
+++ b/secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/GTS_Root_R1.pem b/secure/caroot/trusted/GTS_Root_R1.pem
index 422977ba0649..9abe191b9bb9 100644
--- a/secure/caroot/trusted/GTS_Root_R1.pem
+++ b/secure/caroot/trusted/GTS_Root_R1.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/GTS_Root_R2.pem b/secure/caroot/trusted/GTS_Root_R2.pem
index 06abfca8ccbb..8c5f92d1e610 100644
--- a/secure/caroot/trusted/GTS_Root_R2.pem
+++ b/secure/caroot/trusted/GTS_Root_R2.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/GTS_Root_R3.pem b/secure/caroot/trusted/GTS_Root_R3.pem
index 04d8829f66aa..d621d3053df1 100644
--- a/secure/caroot/trusted/GTS_Root_R3.pem
+++ b/secure/caroot/trusted/GTS_Root_R3.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/GTS_Root_R4.pem b/secure/caroot/trusted/GTS_Root_R4.pem
index c423a356f791..5a7a71764294 100644
--- a/secure/caroot/trusted/GTS_Root_R4.pem
+++ b/secure/caroot/trusted/GTS_Root_R4.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/GeoTrust_Primary_Certification_Authority_-_G2.pem b/secure/caroot/trusted/GeoTrust_Primary_Certification_Authority_-_G2.pem
index 65a90850db69..b03758a63c98 100644
--- a/secure/caroot/trusted/GeoTrust_Primary_Certification_Authority_-_G2.pem
+++ b/secure/caroot/trusted/GeoTrust_Primary_Certification_Authority_-_G2.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem b/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem
index 7566a58a862b..c63f8d8c441a 100644
--- a/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem
+++ b/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem b/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem
index 9d273a384295..7a989c4577d8 100644
--- a/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem
+++ b/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/GlobalSign_Root_CA.pem b/secure/caroot/trusted/GlobalSign_Root_CA.pem
index 71a5de48edad..0e2348e6c4f1 100644
--- a/secure/caroot/trusted/GlobalSign_Root_CA.pem
+++ b/secure/caroot/trusted/GlobalSign_Root_CA.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/GlobalSign_Root_CA_-_R2.pem b/secure/caroot/trusted/GlobalSign_Root_CA_-_R2.pem
index 810db4a2984b..616fe024937a 100644
--- a/secure/caroot/trusted/GlobalSign_Root_CA_-_R2.pem
+++ b/secure/caroot/trusted/GlobalSign_Root_CA_-_R2.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem b/secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem
index 0835e56cd757..aedb37900191 100644
--- a/secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem
+++ b/secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem b/secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem
index 5d792a7da0e5..112aaf7fde17 100644
--- a/secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem
+++ b/secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Global_Chambersign_Root_-_2008.pem b/secure/caroot/trusted/Global_Chambersign_Root_-_2008.pem
index cceb29ac1bfd..cd9bebaf8c0f 100644
--- a/secure/caroot/trusted/Global_Chambersign_Root_-_2008.pem
+++ b/secure/caroot/trusted/Global_Chambersign_Root_-_2008.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
+##  with $FreeBSD$
 ##
 ##  @generated
 ##
diff --git a/secure/caroot/trusted/Go_Daddy_Class_2_CA.pem b/secure/caroot/trusted/Go_Daddy_Class_2_CA.pem
index cb38b1b1c417..5083a0fcf21d 100644
--- a/secure/caroot/trusted/Go_Daddy_Class_2_CA.pem
+++ b/secure/caroot/trusted/Go_Daddy_Class_2_CA.pem
@@ -6,7 +6,7 @@
 ##  root CA list (the file `certdata.txt' in security/nss).
 ##
 ##  Extracted from nss
-##  with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $
*** 979 LINES SKIPPED ***

More information about the dev-commits-src-all mailing list