From: mhoellein Date: Wed, 7 Dec 2022 08:16:39 +0000 (+0100) Subject: committing changes in /etc after apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=77f79cea735bc04d2894d6303eccfb477a0926ed;p=homeserver committing changes in /etc after apt run Package changes: -binutils 2.30-21ubuntu1~18.04.7 amd64 -binutils-common 2.30-21ubuntu1~18.04.7 amd64 -binutils-x86-64-linux-gnu 2.30-21ubuntu1~18.04.7 amd64 +binutils 2.30-21ubuntu1~18.04.8 amd64 +binutils-common 2.30-21ubuntu1~18.04.8 amd64 +binutils-x86-64-linux-gnu 2.30-21ubuntu1~18.04.8 amd64 -ca-certificates 20211016~18.04.1 all -chromium-codecs-ffmpeg-extra 107.0.5304.87-0ubuntu11.18.04.1 amd64 +chromium-codecs-ffmpeg-extra 108.0.5359.71-0ubuntu0.18.04.5 amd64 -code-brand 22.05-18 all -collaboraoffice 22.05.8-2 amd64 -collaboraoffice-ure 22.05.8-2 amd64 +code-brand 22.05-19 all +collaboraoffice 22.05.8-4 amd64 +collaboraoffice-ure 22.05.8-4 amd64 -collaboraofficebasis-calc 22.05.8-2 amd64 -collaboraofficebasis-core 22.05.8-2 amd64 -collaboraofficebasis-draw 22.05.8-2 amd64 -collaboraofficebasis-en-us 22.05.8-2 amd64 -collaboraofficebasis-extension-pdf-import 22.05.8-2 amd64 -collaboraofficebasis-graphicfilter 22.05.8-2 amd64 -collaboraofficebasis-images 22.05.8-2 amd64 -collaboraofficebasis-impress 22.05.8-2 amd64 -collaboraofficebasis-math 22.05.8-2 amd64 -collaboraofficebasis-ooofonts 22.05.8-2 amd64 -collaboraofficebasis-ooolinguistic 22.05.8-2 amd64 -collaboraofficebasis-writer 22.05.8-2 amd64 +collaboraofficebasis-calc 22.05.8-4 amd64 +collaboraofficebasis-core 22.05.8-4 amd64 +collaboraofficebasis-draw 22.05.8-4 amd64 +collaboraofficebasis-en-us 22.05.8-4 amd64 +collaboraofficebasis-extension-pdf-import 22.05.8-4 amd64 +collaboraofficebasis-graphicfilter 22.05.8-4 amd64 +collaboraofficebasis-images 22.05.8-4 amd64 +collaboraofficebasis-impress 22.05.8-4 amd64 +collaboraofficebasis-math 22.05.8-4 amd64 +collaboraofficebasis-ooofonts 22.05.8-4 amd64 +collaboraofficebasis-ooolinguistic 22.05.8-4 amd64 +collaboraofficebasis-writer 22.05.8-4 amd64 -coolwsd 22.05.8.2-1 amd64 +coolwsd 22.05.8.4-1 amd64 -expat 2.2.5-3ubuntu0.8 amd64 +expat 2.2.5-3ubuntu0.9 amd64 -firefox 107.0+linuxmint1+tricia amd64 -firefox-locale-de 107.0+linuxmint1+tricia amd64 -firefox-locale-en 107.0+linuxmint1+tricia amd64 +firefox 107.0.1+linuxmint1+tricia amd64 +firefox-locale-de 107.0.1+linuxmint1+tricia amd64 +firefox-locale-en 107.0.1+linuxmint1+tricia amd64 -grub-common 2.02-2ubuntu8.23 amd64 +grub-common 2.02-2ubuntu8.25 amd64 -grub-pc 2.02-2ubuntu8.23 amd64 -grub-pc-bin 2.02-2ubuntu8.23 amd64 -grub2-common 2.02-2ubuntu8.23 amd64 +grub-pc 2.02-2ubuntu8.25 amd64 +grub-pc-bin 2.02-2ubuntu8.25 amd64 +grub2-common 2.02-2ubuntu8.25 amd64 -imagemagick 8:6.9.7.4+dfsg-16ubuntu6.13 amd64 -imagemagick-6-common 8:6.9.7.4+dfsg-16ubuntu6.13 all -imagemagick-6.q16 8:6.9.7.4+dfsg-16ubuntu6.13 amd64 -imagemagick-common 8:6.9.7.4+dfsg-16ubuntu6.13 all +imagemagick 8:6.9.7.4+dfsg-16ubuntu6.14 amd64 +imagemagick-6-common 8:6.9.7.4+dfsg-16ubuntu6.14 all +imagemagick-6.q16 8:6.9.7.4+dfsg-16ubuntu6.14 amd64 +imagemagick-common 8:6.9.7.4+dfsg-16ubuntu6.14 all -libbinutils 2.30-21ubuntu1~18.04.7 amd64 +libbinutils 2.30-21ubuntu1~18.04.8 amd64 -libexpat1 2.2.5-3ubuntu0.8 amd64 -libexpat1 2.2.5-3ubuntu0.8 i386 -libexpat1-dev 2.2.5-3ubuntu0.8 amd64 +libexpat1 2.2.5-3ubuntu0.9 amd64 +libexpat1 2.2.5-3ubuntu0.9 i386 +libexpat1-dev 2.2.5-3ubuntu0.9 amd64 -libflac8 1.3.2-1 amd64 -libflac8 1.3.2-1 i386 +libflac8 1.3.2-1ubuntu0.1 amd64 +libflac8 1.3.2-1ubuntu0.1 i386 -libice6 2:1.0.9-2 amd64 -libice6 2:1.0.9-2 i386 +libice6 2:1.0.9-2ubuntu0.18.04.1 amd64 +libice6 2:1.0.9-2ubuntu0.18.04.1 i386 -libmagickcore-6.q16-3 8:6.9.7.4+dfsg-16ubuntu6.13 amd64 +libmagickcore-6.q16-3 8:6.9.7.4+dfsg-16ubuntu6.14 amd64 -libmagickwand-6.q16-3 8:6.9.7.4+dfsg-16ubuntu6.13 amd64 +libmagickwand-6.q16-3 8:6.9.7.4+dfsg-16ubuntu6.14 amd64 -libtiff5 4.0.9-5ubuntu0.8 amd64 -libtiff5 4.0.9-5ubuntu0.8 i386 +libtiff5 4.0.9-5ubuntu0.9 amd64 +libtiff5 4.0.9-5ubuntu0.9 i386 -libxml2 2.9.4+dfsg1-6.1ubuntu1.7 amd64 -libxml2 2.9.4+dfsg1-6.1ubuntu1.7 i386 -libxml2-utils 2.9.4+dfsg1-6.1ubuntu1.7 amd64 +libxml2 2.9.4+dfsg1-6.1ubuntu1.8 amd64 +libxml2 2.9.4+dfsg1-6.1ubuntu1.8 i386 +libxml2-utils 2.9.4+dfsg1-6.1ubuntu1.8 amd64 -linux-libc-dev 4.15.0-197.208 amd64 +linux-libc-dev 4.15.0-200.211 amd64 -login 1:4.5-1ubuntu2.3 amd64 +login 1:4.5-1ubuntu2.5 amd64 -passwd 1:4.5-1ubuntu2.3 amd64 +passwd 1:4.5-1ubuntu2.5 amd64 -python-libxml2 2.9.4+dfsg1-6.1ubuntu1.7 amd64 +python-libxml2 2.9.4+dfsg1-6.1ubuntu1.8 amd64 -ubuntu-advantage-tools 27.11.3~18.04.1 amd64 +ubuntu-advantage-tools 27.12~18.04.1 amd64 -xserver-common 2:1.19.6-1ubuntu4.11 all +xserver-common 2:1.19.6-1ubuntu4.12 all -xserver-xorg-core 2:1.19.6-1ubuntu4.11 amd64 +xserver-xorg-core 2:1.19.6-1ubuntu4.12 amd64 --- diff --git a/.etckeeper b/.etckeeper index a605428a..2e69e6c6 100755 --- a/.etckeeper +++ b/.etckeeper @@ -8171,6 +8171,7 @@ maybe chmod 0644 'letsencrypt/csr/3791_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3792_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3793_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/3794_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/3795_csr-certbot.pem' maybe chmod 0700 'letsencrypt/keys' maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem' @@ -11968,6 +11969,7 @@ maybe chmod 0600 'letsencrypt/keys/3792_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3793_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3794_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/3795_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/3796_key-certbot.pem' maybe chmod 0755 'letsencrypt/live' maybe chmod 0755 'letsencrypt/live/ccu.hoellein.online' maybe chmod 0644 'letsencrypt/live/ccu.hoellein.online/README' diff --git a/ca-certificates.conf b/ca-certificates.conf index a517b2c3..ca44c2f9 100644 --- a/ca-certificates.conf +++ b/ca-certificates.conf @@ -223,9 +223,9 @@ mozilla/SSL.com_EV_Root_Certification_Authority_ECC.crt mozilla/SSL.com_EV_Root_Certification_Authority_RSA_R2.crt mozilla/SSL.com_Root_Certification_Authority_ECC.crt mozilla/SSL.com_Root_Certification_Authority_RSA.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/GlobalSign_Root_CA_-_R6.crt mozilla/OISTE_WISeKey_Global_Root_GC_CA.crt mozilla/Certigna_Root_CA.crt diff --git a/coolwsd/coolkitconfig.xcu b/coolwsd/coolkitconfig.xcu index 88e698a0..08b92e11 100644 --- a/coolwsd/coolkitconfig.xcu +++ b/coolwsd/coolkitconfig.xcu @@ -62,4 +62,7 @@ org.openoffice.lingu.LanguageToolGrammarChecker org.openoffice.lingu.LanguageToolGrammarChecker + +anydefaulthidden + diff --git a/letsencrypt/csr/3795_csr-certbot.pem b/letsencrypt/csr/3795_csr-certbot.pem new file mode 100644 index 00000000..02f56b5e --- /dev/null +++ b/letsencrypt/csr/3795_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu+ +fexmkwH5NlgBDdOtS1HjN0YWWNzrzZtq81SG6+o+YwzQIpxKvEr5XzB5YRsnLbOt +3YK5KmP+ImzzUfASAkkPnXMaSxIVSFrabKaLRgBCzH3m/CTHv1MXXOxITa+CiJ9a +fKpjbsZcTLE56KQYVIKcYTjZnGWubgiykAT9N1sEFYfJjRDq8NZtTsDXyYc84eHA +rmf/5D9FTm/oubHZvFqeqkgTxs8NBnGVjCqcffFQaqW1WfXX161fL/RCqLH4Spag +U+k7CB+jwKYP1GY1keslxtNIT83aYWzXwhLhNEXWKyicXpQRQBBlvX+1cD7kYhzP +lzYINIPiKZIeTTCrXfUCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw +FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQA3mzIMkkGf +JGmX4knnsMOOFy+oEXcUqS8Y4KRIAjKP5Mnf7idDfMzbFbR3MkEanXu6DdYHT8tX +tJ8Am+qoRIOJeMlnzfkgZATzwLOV8dzzWgiBv1hEpcb2a0hzdKJJDsbQ4zYaeEu2 +Sa4MeHAczZRGA6oeGQwFU7BmoAO8X7m4GeLYTITy+GfuDtpFhu/DaxxmlAyppST5 +CtRCri+M/evI8ffQkJDqzPgsVpxyuZ2dszG9nNkH360E99d3AOUW2LI4odtTFl7e +9rCoIyCsByuM2INPfDJweYqM2UfaTn2Y/iaoHCUi6+V1+PRC0mQXjQlsBNtimcdg +ElNzDRGQFda1 +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/3796_key-certbot.pem b/letsencrypt/keys/3796_key-certbot.pem new file mode 100644 index 00000000..b462fccf --- /dev/null +++ b/letsencrypt/keys/3796_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDLvn3sZpMB+TZY +AQ3TrUtR4zdGFljc682bavNUhuvqPmMM0CKcSrxK+V8weWEbJy2zrd2CuSpj/iJs +81HwEgJJD51zGksSFUha2mymi0YAQsx95vwkx79TF1zsSE2vgoifWnyqY27GXEyx +OeikGFSCnGE42Zxlrm4IspAE/TdbBBWHyY0Q6vDWbU7A18mHPOHhwK5n/+Q/RU5v +6Lmx2bxanqpIE8bPDQZxlYwqnH3xUGqltVn119etXy/0Qqix+EqWoFPpOwgfo8Cm +D9RmNZHrJcbTSE/N2mFs18IS4TRF1isonF6UEUAQZb1/tXA+5GIcz5c2CDSD4imS +Hk0wq131AgMBAAECggEACoUzi1lgjeGIZNLpG9z+3qOU3xGYVQ/39eZ32g19cQL3 +qlm0780MG/L0b1RVJ0nGmliH75AQGEmvDWEjAfpsE8myn5bj+XMP4WEV6yOV4b2R +QY8DxgJqZqf2LF0vZbifxVquxT2NIsDxVNVgpdh7xKK+gmj6ImX3WIuf1CIfEZv0 +uhJ1QiPYauI0n9m08zQHFEqixDvZ46cy1jvOZNNOd3s3HS/NFb3q4ltqqH+fKa1r +fodTU8F64khlZAi8811fkQWdT+z7Cl1myBJBvEPudC9gE2J+MdBLjV7IlX0zzKlf +plGNGiWnU7kGTEeWqKMgBnzitUVlyGCoD99gAED5AQKBgQD2BbioUUYjKUoH2wXl +vR74IewRSRrMvG1LK1hJrFO5TuO+a64XLTRKXr7GBZRqLyoMswhvEnerimch8aQu +DOxMqfOyosMpgYotw+V9waYsUIUjhQFnMFfrzlJjD1aUc7y2JmwXGD8QiLgIK5kq ++iaf+Z1G4JzdQ6zajL50CRvH6QKBgQDUAdM2tUWX6NqwpwFWaAAV56Tfxz7Nts8M +ikPVCtd3CJOwhVSRjtu2myNBTzkfw55pJed7TFElMdnRwpv72OsW2/EkyjqFGOwY +0vTxr6FY4s+FcS8vtAQr9hkx596mVj9CMeibU6tXXn+PZ6MCEvrVYcQTpoIbgRUz +JEhBRvUqLQKBgQDgQNLTSlIeVtKOWo0DnuIN2A3wq6xsFw2gyT/O1+/xKAHcXxbv +NVtGtxo6MnfYWml/7emwJStECAJ+JF89QrZaI0hp+obe3J9xm/EiMlQgbL0PZXuj +7aMW5JighyiqZN0NQ/SfEJDbp2PovqT9UcvHYqaEJtWVssxq4oPwDSVvkQKBgH2V +Oy0sAbZzi5+avdMWNf7DwcmA9/XZdRpjiLzY+DsdjIbC5A55BjNMAH0+VYM4WEzG +1DEYSvTya6myUr3Dh7Z5wIVfeXy//5LQ26GSvMuvRugv3JiwVMxJsjD6vcvgSQaI +E9Z2oIdXhc5HwKqI3aaqjABr4KQ0OX+a3WY1hyJdAoGAYlBvgvN0Ty8YmZ2GaJGb +F6nUK8ZYU8eJZ1/LhqMEr9SqAJetManOEj/jZbMPP8L2q7uMRmK9KwIpSVPPWRnc +5vHHAeiFPjEcbaTJsB+ha4kHL8sHk7uucpSnwtXxaqLwE8k1ks3BSzgBTfDVCpLr +XfyMYYDf+cPPj7U77of0jpk= +-----END PRIVATE KEY----- diff --git a/ssl/certs/3e44d2f7.0 b/ssl/certs/3e44d2f7.0 deleted file mode 120000 index a2d890d2..00000000 --- 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 53dceb0c..00000000 --- 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 86ed3f8d..00000000 --- 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 eb7d639b..00000000 --- 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 5334459b..00000000 --- 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 68de1ae2..00000000 --- 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/ubuntu-advantage/help_data.yaml b/ubuntu-advantage/help_data.yaml index 1b66441f..45887d84 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 ceb22723..cc823340 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"