committing changes in /etc made by "apt-get upgrade"

Package changes:
-apache2 2.4.49-1+ubuntu20.04.1+deb.sury.org+1 amd64
-apache2-bin 2.4.49-1+ubuntu20.04.1+deb.sury.org+1 amd64
-apache2-data 2.4.49-1+ubuntu20.04.1+deb.sury.org+1 all
-apache2-utils 2.4.49-1+ubuntu20.04.1+deb.sury.org+1 amd64
+apache2 2.4.49-3+ubuntu20.04.1+deb.sury.org+2 amd64
+apache2-bin 2.4.49-3+ubuntu20.04.1+deb.sury.org+2 amd64
+apache2-data 2.4.49-3+ubuntu20.04.1+deb.sury.org+2 all
+apache2-utils 2.4.49-3+ubuntu20.04.1+deb.sury.org+2 amd64
-ca-certificates 20210119~20.04.1 all
+ca-certificates 20210119~20.04.2 all
-libdrm-amdgpu1 2.4.105-3~20.04.1 amd64
-libdrm-common 2.4.105-3~20.04.1 all
-libdrm-intel1 2.4.105-3~20.04.1 amd64
-libdrm-nouveau2 2.4.105-3~20.04.1 amd64
-libdrm-radeon1 2.4.105-3~20.04.1 amd64
-libdrm2 2.4.105-3~20.04.1 amd64
+libdrm-amdgpu1 2.4.105-3~20.04.2 amd64
+libdrm-common 2.4.105-3~20.04.2 all
+libdrm-intel1 2.4.105-3~20.04.2 amd64
+libdrm-nouveau2 2.4.105-3~20.04.2 amd64
+libdrm-radeon1 2.4.105-3~20.04.2 amd64
+libdrm2 2.4.105-3~20.04.2 amd64
-libgl1-mesa-dri 21.0.3-0ubuntu0.3~20.04.1 amd64
-libglapi-mesa 21.0.3-0ubuntu0.3~20.04.1 amd64
+libgl1-mesa-dri 21.0.3-0ubuntu0.3~20.04.2 amd64
+libglapi-mesa 21.0.3-0ubuntu0.3~20.04.2 amd64
-libnetplan0 0.102-0ubuntu1~20.04.2 amd64
+libnetplan0 0.103-0ubuntu5~20.04.1 amd64
-linux-firmware 1.187.16 all
+linux-firmware 1.187.17 all
-linux-libc-dev 5.4.0-86.97 amd64
+linux-libc-dev 5.4.0-88.99 amd64
-mesa-vulkan-drivers 21.0.3-0ubuntu0.3~20.04.1 amd64
+mesa-vulkan-drivers 21.0.3-0ubuntu0.3~20.04.2 amd64
-netplan.io 0.102-0ubuntu1~20.04.2 amd64
+netplan.io 0.103-0ubuntu5~20.04.1 amd64
-postfix 3.4.13-0ubuntu1.1 amd64
-postfix-mysql 3.4.13-0ubuntu1.1 amd64
+postfix 3.4.13-0ubuntu1.2 amd64
+postfix-mysql 3.4.13-0ubuntu1.2 amd64
-python3-update-manager 1:20.04.10.7 all
+python3-update-manager 1:20.04.10.9 all
-update-manager-core 1:20.04.10.7 all
+update-manager-core 1:20.04.10.9 all
-vim 2:8.1.2269-1ubuntu5 amd64
+vim 2:8.1.2269-1ubuntu5.3 amd64
-vim-common 2:8.1.2269-1ubuntu5 all
+vim-common 2:8.1.2269-1ubuntu5.3 all
-vim-runtime 2:8.1.2269-1ubuntu5 all
-vim-tiny 2:8.1.2269-1ubuntu5 amd64
+vim-runtime 2:8.1.2269-1ubuntu5.3 all
+vim-tiny 2:8.1.2269-1ubuntu5.3 amd64
-xxd 2:8.1.2269-1ubuntu5 amd64
+xxd 2:8.1.2269-1ubuntu5.3 amd64

diff --git a/.etckeeper b/.etckeeper
index 605cadaa475378d395dd423aa0c7041c03c499d5..e9a5e9bf865618462f7a0db401f3b167a7d0adcc 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1582,6 +1582,7 @@ maybe chmod 0755 'ldap/schema'
 maybe chmod 0644 'ldap/schema/amavis.schema'
 maybe chmod 0644 'legal'
 maybe chmod 0755 'letsencrypt'
+maybe chmod 0600 'letsencrypt/.certbot.lock'
 maybe chmod 0644 'letsencrypt/.updated-options-ssl-apache-conf-digest.txt'
 maybe chmod 0700 'letsencrypt/accounts'
 maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org'

diff --git a/ca-certificates.conf b/ca-certificates.conf
index 0536b531004b882bdb72a2cac8eb0ec13e2dbed7..8e83a20b8fe6f9b273f4c22c2d3a51f457268c90 100644 (file)
--- a/ca-certificates.conf
+++ b/ca-certificates.conf
@@ -43,7 +43,7 @@ mozilla/Comodo_AAA_Services_root.crt
 mozilla/Cybertrust_Global_Root.crt
 mozilla/D-TRUST_Root_Class_3_CA_2_2009.crt
 mozilla/D-TRUST_Root_Class_3_CA_2_EV_2009.crt
-mozilla/DST_Root_CA_X3.crt
+!mozilla/DST_Root_CA_X3.crt
 !mozilla/Deutsche_Telekom_Root_CA_2.crt
 mozilla/DigiCert_Assured_ID_Root_CA.crt
 mozilla/DigiCert_Assured_ID_Root_G2.crt

diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/ssl/certs/2e5ac55d.0 b/ssl/certs/2e5ac55d.0
deleted file mode 120000 (symlink)
index 6693cc9..0000000
--- a/ssl/certs/2e5ac55d.0
+++ /dev/null
@@ -1 +0,0 @@
-DST_Root_CA_X3.pem
\ No newline at end of file

diff --git a/ssl/certs/DST_Root_CA_X3.pem b/ssl/certs/DST_Root_CA_X3.pem
deleted file mode 120000 (symlink)
index c9d3209..0000000
--- a/ssl/certs/DST_Root_CA_X3.pem
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/ca-certificates/mozilla/DST_Root_CA_X3.crt
\ No newline at end of file

diff --git a/ssl/certs/ca-certificates.crt b/ssl/certs/ca-certificates.crt
index 33a2fbe10c1757ffdffe6dae12f330161f5801b4..48f233a09ad66f1c1c18fa8140893a396b74cdff 100644 (file)
--- a/ssl/certs/ca-certificates.crt
+++ b/ssl/certs/ca-certificates.crt
@@ -762,26 +762,6 @@ xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX
 KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
-PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
-Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
-rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
-OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
-xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
-7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
-aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
-SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
-ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
-AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
-R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
-JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
-Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
 MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
 d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv