From 3d4c03d9cc66da3db94adb2141ff674ad882f85c Mon Sep 17 00:00:00 2001 From: mhoellein Date: Wed, 7 Dec 2022 09:29:49 +0100 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -binutils 2.34-6ubuntu1.3 amd64 -binutils-common 2.34-6ubuntu1.3 amd64 -binutils-x86-64-linux-gnu 2.34-6ubuntu1.3 amd64 +binutils 2.34-6ubuntu1.4 amd64 +binutils-common 2.34-6ubuntu1.4 amd64 +binutils-x86-64-linux-gnu 2.34-6ubuntu1.4 amd64 -ca-certificates 20211016~20.04.1 all +ca-certificates 20211016ubuntu0.20.04.1 all -icinga-php-library 0.10.0-1+ubuntu20.04 amd64 -icinga-php-thirdparty 0.11.0-1.focal amd64 +icinga-php-library 0.10.0-2+ubuntu20.04 all +icinga-php-thirdparty 0.11.0-2.focal all -libbinutils 2.34-6ubuntu1.3 amd64 +libbinutils 2.34-6ubuntu1.4 amd64 -libctf-nobfd0 2.34-6ubuntu1.3 amd64 -libctf0 2.34-6ubuntu1.3 amd64 +libctf-nobfd0 2.34-6ubuntu1.4 amd64 +libctf0 2.34-6ubuntu1.4 amd64 -libtiff5 4.1.0+git191117-2ubuntu0.20.04.6 amd64 +libtiff5 4.1.0+git191117-2ubuntu0.20.04.7 amd64 -libxml2 2.9.10+dfsg-5ubuntu0.20.04.4 amd64 +libxml2 2.9.10+dfsg-5ubuntu0.20.04.5 amd64 -ubuntu-advantage-tools 27.11.3~20.04.1 amd64 +ubuntu-advantage-tools 27.12~20.04.1 amd64 --- ca-certificates.conf | 6 +- ssl/certs/3e44d2f7.0 | 1 - ssl/certs/5d3033c5.0 | 1 - ssl/certs/7aaf71c0.0 | 1 - ssl/certs/TrustCor_ECA-1.pem | 1 - ssl/certs/TrustCor_RootCert_CA-1.pem | 1 - ssl/certs/TrustCor_RootCert_CA-2.pem | 1 - ssl/certs/ca-certificates.crt | 86 ------------------------- ubuntu-advantage/help_data.yaml | 12 ++-- update-motd.d/91-contract-ua-esm-status | 8 ++- 10 files changed, 14 insertions(+), 104 deletions(-) delete mode 120000 ssl/certs/3e44d2f7.0 delete mode 120000 ssl/certs/5d3033c5.0 delete mode 120000 ssl/certs/7aaf71c0.0 delete mode 120000 ssl/certs/TrustCor_ECA-1.pem delete mode 120000 ssl/certs/TrustCor_RootCert_CA-1.pem delete mode 120000 ssl/certs/TrustCor_RootCert_CA-2.pem diff --git a/ca-certificates.conf b/ca-certificates.conf index 6e5b922e8..2622d17a9 100644 --- a/ca-certificates.conf +++ b/ca-certificates.conf @@ -124,9 +124,9 @@ mozilla/TWCA_Global_Root_CA.crt mozilla/TWCA_Root_Certification_Authority.crt !mozilla/Taiwan_GRCA.crt mozilla/TeliaSonera_Root_CA_v1.crt -mozilla/TrustCor_ECA-1.crt -mozilla/TrustCor_RootCert_CA-1.crt -mozilla/TrustCor_RootCert_CA-2.crt +!mozilla/TrustCor_ECA-1.crt +!mozilla/TrustCor_RootCert_CA-1.crt +!mozilla/TrustCor_RootCert_CA-2.crt !mozilla/Trustis_FPS_Root_CA.crt !mozilla/TÜRKTRUST_Elektronik_Sertifika_Hizmet_Sağlayıcısı_H5.crt mozilla/USERTrust_ECC_Certification_Authority.crt diff --git a/ssl/certs/3e44d2f7.0 b/ssl/certs/3e44d2f7.0 deleted file mode 120000 index a2d890d2f..000000000 --- a/ssl/certs/3e44d2f7.0 +++ /dev/null @@ -1 +0,0 @@ -TrustCor_RootCert_CA-2.pem \ No newline at end of file diff --git a/ssl/certs/5d3033c5.0 b/ssl/certs/5d3033c5.0 deleted file mode 120000 index 53dceb0c1..000000000 --- a/ssl/certs/5d3033c5.0 +++ /dev/null @@ -1 +0,0 @@ -TrustCor_RootCert_CA-1.pem \ No newline at end of file diff --git a/ssl/certs/7aaf71c0.0 b/ssl/certs/7aaf71c0.0 deleted file mode 120000 index 86ed3f8dd..000000000 --- a/ssl/certs/7aaf71c0.0 +++ /dev/null @@ -1 +0,0 @@ -TrustCor_ECA-1.pem \ No newline at end of file diff --git a/ssl/certs/TrustCor_ECA-1.pem b/ssl/certs/TrustCor_ECA-1.pem deleted file mode 120000 index eb7d639b4..000000000 --- a/ssl/certs/TrustCor_ECA-1.pem +++ /dev/null @@ -1 +0,0 @@ -/usr/share/ca-certificates/mozilla/TrustCor_ECA-1.crt \ No newline at end of file diff --git a/ssl/certs/TrustCor_RootCert_CA-1.pem b/ssl/certs/TrustCor_RootCert_CA-1.pem deleted file mode 120000 index 5334459b0..000000000 --- a/ssl/certs/TrustCor_RootCert_CA-1.pem +++ /dev/null @@ -1 +0,0 @@ -/usr/share/ca-certificates/mozilla/TrustCor_RootCert_CA-1.crt \ No newline at end of file diff --git a/ssl/certs/TrustCor_RootCert_CA-2.pem b/ssl/certs/TrustCor_RootCert_CA-2.pem deleted file mode 120000 index 68de1ae28..000000000 --- a/ssl/certs/TrustCor_RootCert_CA-2.pem +++ /dev/null @@ -1 +0,0 @@ -/usr/share/ca-certificates/mozilla/TrustCor_RootCert_CA-2.crt \ No newline at end of file diff --git a/ssl/certs/ca-certificates.crt b/ssl/certs/ca-certificates.crt index eaa1ed5b2..6a14d2ca5 100644 --- a/ssl/certs/ca-certificates.crt +++ b/ssl/certs/ca-certificates.crt @@ -2256,92 +2256,6 @@ HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD -VQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEk -MCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U -cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDlRydXN0Q29y -IEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3MjgwN1owgZwxCzAJBgNV -BAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQw -IgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRy -dXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3Ig -RUNBLTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb -3w9U73NjKYKtR8aja+3+XzP4Q1HpGjORMRegdMTUpwHmspI+ap3tDvl0mEDTPwOA -BoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23xFUfJ3zSCNV2HykVh0A5 -3ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmcp0yJF4Ou -owReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/ -wZ0+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZF -ZtS6mFjBAgMBAAGjYzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAf -BgNVHSMEGDAWgBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/ -MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEABT41XBVwm8nHc2Fv -civUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u/ukZMjgDfxT2 -AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F -hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50 -soIipX1TH0XsJ5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BI -WJZpTdwHjFGTot+fDz2LYLSCjaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1Wi -tJ/X5g== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD -VQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEk -MCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U -cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29y -IFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkxMjMxMTcyMzE2WjCB -pDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFuYW1h -IENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUG -A1UECwweVHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZU -cnVzdENvciBSb290Q2VydCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAv463leLCJhJrMxnHQFgKq1mqjQCj/IDHUHuO1CAmujIS2CNUSSUQIpid -RtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4pQa81QBeCQryJ3pS/C3V -seq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0JEsq1pme -9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CV -EY4hgLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorW -hnAbJN7+KIor0Gqw/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/ -DeOxCbeKyKsZn3MzUOcwHwYDVR0jBBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcw -DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD -ggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5mDo4Nvu7Zp5I -/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf -ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZ -yonnMlo2HD6CqFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djts -L1Ac59v2Z3kf9YKVmgenFK+P3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdN -zl/HHk484IkzlQsPpTLWPFp5LBk= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNV -BAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQw -IgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRy -dXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0eTEfMB0GA1UEAwwWVHJ1c3RDb3Ig -Um9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEyMzExNzI2MzlaMIGk -MQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEg -Q2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYD -VQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRy -dXN0Q29yIFJvb3RDZXJ0IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK -AoICAQCnIG7CKqJiJJWQdsg4foDSq8GbZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+ -QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9NkRvRUqdw6VC0xK5mC8tkq -1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1oYxOdqHp -2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nK -DOObXUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hape -az6LMvYHL1cEksr1/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF -3wP+TfSvPd9cW436cOGlfifHhi5qjxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88 -oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQPeSghYA2FFn3XVDjxklb9tTNM -g9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+CtgrKAmrhQhJ8Z3 -mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh -8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAd -BgNVHQ4EFgQU2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6U -nrybPZx9mCAZ5YwwYrIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYw -DQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/hOsh80QA9z+LqBrWyOrsGS2h60COX -dKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnpkpfbsEZC89NiqpX+ -MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv2wnL -/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RX -CI/hOWB3S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYa -ZH9bDTMJBzN7Bj8RpFxwPIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW -2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dvDDqPys/cA8GiCcjl/YBeyGBCARsaU1q7 -N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYURpFHmygk71dSTlxCnKr3 -Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANExdqtvArB -As8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp -5KeXRKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu -1uwJ ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDEL MAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNl eSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMT diff --git a/ubuntu-advantage/help_data.yaml b/ubuntu-advantage/help_data.yaml index 1b66441f3..45887d840 100644 --- a/ubuntu-advantage/help_data.yaml +++ b/ubuntu-advantage/help_data.yaml @@ -62,13 +62,11 @@ livepatch: realtime-kernel: help: | - The real-time kernel is a beta version of the 22.04 Ubuntu kernel with the - PREEMPT_RT patchset integrated for x86_64 and ARM64. It services extreme - latency-dependent use cases and provides deterministic response times to - service events. By meeting stringent preemption specifications, the - real-time kernel is suitable for telco applications and embedded devices - in industrial automation and robotics. To enroll in the beta program, visit - https://ubuntu.com/realtime-kernel + The real-time kernel is an Ubuntu kernel with PREEMPT_RT patches integrated. + It services latency-dependent use cases by providing deterministic response times. + The real-time kernel meets stringent preemption specifications and is suitable for + telco applications and dedicated devices in industrial automation and robotics. + The real-time kernel is currently incompatible with FIPS and Livepatch. ros: help: | diff --git a/update-motd.d/91-contract-ua-esm-status b/update-motd.d/91-contract-ua-esm-status index ceb22723c..cc823340c 100755 --- a/update-motd.d/91-contract-ua-esm-status +++ b/update-motd.d/91-contract-ua-esm-status @@ -1,4 +1,8 @@ #!/bin/sh -stamp="/var/lib/ubuntu-advantage/messages/motd-esm-service-status" +esm_stamp="/var/lib/ubuntu-advantage/messages/motd-esm-service-status" -[ ! -r "$stamp" ] || cat "$stamp" +[ ! -r "$esm_stamp" ] || cat "$esm_stamp" + +auto_attach_stamp="/var/lib/ubuntu-advantage/messages/motd-auto-attach-status" + +[ ! -r "$auto_attach_stamp" ] || cat "$auto_attach_stamp" -- 2.43.0