From 46a6cce161fc906dd4c73398d55d6732d19c68cb Mon Sep 17 00:00:00 2001 From: mhoellein Date: Fri, 13 Jun 2025 10:11:45 +0200 Subject: [PATCH] committing changes in /etc made by "apt upgrade" Package changes: -apache2 2.4.62-1+ubuntu20.04.1+deb.sury.org+1 amd64 -apache2-bin 2.4.62-1+ubuntu20.04.1+deb.sury.org+1 amd64 -apache2-data 2.4.62-1+ubuntu20.04.1+deb.sury.org+1 all -apache2-utils 2.4.62-1+ubuntu20.04.1+deb.sury.org+1 amd64 +apache2 2.4.63-1+ubuntu20.04.1+deb.sury.org+2 amd64 +apache2-bin 2.4.63-1+ubuntu20.04.1+deb.sury.org+2 amd64 +apache2-data 2.4.63-1+ubuntu20.04.1+deb.sury.org+2 all +apache2-utils 2.4.63-1+ubuntu20.04.1+deb.sury.org+2 amd64 -apt 2.0.10 amd64 +apt 2.0.11 amd64 -apt-transport-https 2.0.10 all -apt-utils 2.0.10 amd64 +apt-transport-https 2.0.11 all +apt-utils 2.0.11 amd64 -binutils 2.34-6ubuntu1.9 amd64 -binutils-common 2.34-6ubuntu1.9 amd64 -binutils-x86-64-linux-gnu 2.34-6ubuntu1.9 amd64 +binutils 2.34-6ubuntu1.11 amd64 +binutils-common 2.34-6ubuntu1.11 amd64 +binutils-x86-64-linux-gnu 2.34-6ubuntu1.11 amd64 -code-brand 24.04-30 all -collaboraoffice 24.04.12-2 amd64 -collaboraoffice-ure 24.04.12-2 amd64 -collaboraofficebasis-calc 24.04.12-2 amd64 -collaboraofficebasis-core 24.04.12-2 amd64 -collaboraofficebasis-draw 24.04.12-2 amd64 -collaboraofficebasis-en-us 24.04.12-2 amd64 -collaboraofficebasis-extension-pdf-import 24.04.12-2 amd64 -collaboraofficebasis-graphicfilter 24.04.12-2 amd64 -collaboraofficebasis-images 24.04.12-2 amd64 -collaboraofficebasis-impress 24.04.12-2 amd64 -collaboraofficebasis-math 24.04.12-2 amd64 -collaboraofficebasis-ooofonts 24.04.12-2 amd64 -collaboraofficebasis-ooolinguistic 24.04.12-2 amd64 -collaboraofficebasis-writer 24.04.12-2 amd64 +code-brand 25.04.2-2 all +collaboraoffice 25.04.2-2 amd64 +collaboraoffice-ure 25.04.2-2 amd64 +collaboraofficebasis-calc 25.04.2-2 amd64 +collaboraofficebasis-core 25.04.2-2 amd64 +collaboraofficebasis-draw 25.04.2-2 amd64 +collaboraofficebasis-en-us 25.04.2-2 amd64 +collaboraofficebasis-extension-pdf-import 25.04.2-2 amd64 +collaboraofficebasis-graphicfilter 25.04.2-2 amd64 +collaboraofficebasis-images 25.04.2-2 amd64 +collaboraofficebasis-impress 25.04.2-2 amd64 +collaboraofficebasis-math 25.04.2-2 amd64 +collaboraofficebasis-ooofonts 25.04.2-2 amd64 +collaboraofficebasis-ooolinguistic 25.04.2-2 amd64 +collaboraofficebasis-writer 25.04.2-2 amd64 -coolwsd 24.04.12.2-1 amd64 +coolwsd 25.04.2.2-1 amd64 -cryptsetup 2:2.2.2-3ubuntu2.4 amd64 -cryptsetup-bin 2:2.2.2-3ubuntu2.4 amd64 -cryptsetup-initramfs 2:2.2.2-3ubuntu2.4 all -cryptsetup-run 2:2.2.2-3ubuntu2.4 all +cryptsetup 2:2.2.2-3ubuntu2.5 amd64 +cryptsetup-bin 2:2.2.2-3ubuntu2.5 amd64 +cryptsetup-initramfs 2:2.2.2-3ubuntu2.5 all +cryptsetup-run 2:2.2.2-3ubuntu2.5 all -dirmngr 2.2.19-3ubuntu2.2 amd64 +dirmngr 2.2.19-3ubuntu2.4 amd64 -distro-info-data 0.43ubuntu1.17 all +distro-info-data 0.43ubuntu1.18 all -dns-root-data 2023112702~ubuntu0.20.04.1 all +dns-root-data 2024071801~ubuntu0.20.04.1 all -ghostscript 9.50~dfsg-5ubuntu4.14 amd64 +ghostscript 9.50~dfsg-5ubuntu4.15 amd64 -git 1:2.25.1-1ubuntu3.13 amd64 -git-man 1:2.25.1-1ubuntu3.13 all +git 1:2.25.1-1ubuntu3.14 amd64 +git-man 1:2.25.1-1ubuntu3.14 all -gnupg 2.2.19-3ubuntu2.2 all -gnupg-l10n 2.2.19-3ubuntu2.2 all -gnupg-utils 2.2.19-3ubuntu2.2 amd64 +gnupg 2.2.19-3ubuntu2.4 all +gnupg-l10n 2.2.19-3ubuntu2.4 all +gnupg-utils 2.2.19-3ubuntu2.4 amd64 -gpg 2.2.19-3ubuntu2.2 amd64 -gpg-agent 2.2.19-3ubuntu2.2 amd64 -gpg-wks-client 2.2.19-3ubuntu2.2 amd64 -gpg-wks-server 2.2.19-3ubuntu2.2 amd64 -gpgconf 2.2.19-3ubuntu2.2 amd64 -gpgsm 2.2.19-3ubuntu2.2 amd64 -gpgv 2.2.19-3ubuntu2.2 amd64 +gpg 2.2.19-3ubuntu2.4 amd64 +gpg-agent 2.2.19-3ubuntu2.4 amd64 +gpg-wks-client 2.2.19-3ubuntu2.4 amd64 +gpg-wks-server 2.2.19-3ubuntu2.4 amd64 +gpgconf 2.2.19-3ubuntu2.4 amd64 +gpgsm 2.2.19-3ubuntu2.4 amd64 +gpgv 2.2.19-3ubuntu2.4 amd64 +html2text 1.3.2a-25 amd64 -imagemagick-6-common 8:6.9.10.23+dfsg-2.1ubuntu11.10 all +imagemagick-6-common 8:6.9.10.23+dfsg-2.1ubuntu11.11 all -initramfs-tools 0.136ubuntu6.7 all -initramfs-tools-bin 0.136ubuntu6.7 amd64 -initramfs-tools-core 0.136ubuntu6.7 all +initramfs-tools 0.136ubuntu6.8 all +initramfs-tools-bin 0.136ubuntu6.8 amd64 +initramfs-tools-core 0.136ubuntu6.8 all -intel-microcode 3.20241112.0ubuntu0.20.04.1 amd64 +intel-microcode 3.20250512.0ubuntu0.20.04.1 amd64 -krb5-locales 1.17-6ubuntu4.8 all +krb5-locales 1.17-6ubuntu4.11 all -libapache2-mod-php7.4 7.4.3-4ubuntu2.28 amd64 +libapache2-mod-php7.4 7.4.3-4ubuntu2.29 amd64 -libapt-pkg6.0 2.0.10 amd64 +libapt-pkg6.0 2.0.11 amd64 -libbinutils 2.34-6ubuntu1.9 amd64 +libbinutils 2.34-6ubuntu1.11 amd64 -libc-bin 2.31-0ubuntu9.16 amd64 -libc-dev-bin 2.31-0ubuntu9.16 amd64 -libc6 2.31-0ubuntu9.16 amd64 -libc6-dev 2.31-0ubuntu9.16 amd64 +libc-bin 2.31-0ubuntu9.18 amd64 +libc-dev-bin 2.31-0ubuntu9.18 amd64 +libc6 2.31-0ubuntu9.18 amd64 +libc6-dev 2.31-0ubuntu9.18 amd64 -libcap2 1:2.32-1ubuntu0.1 amd64 -libcap2-bin 1:2.32-1ubuntu0.1 amd64 +libcap2 1:2.32-1ubuntu0.2 amd64 +libcap2-bin 1:2.32-1ubuntu0.2 amd64 -libcryptsetup12 2:2.2.2-3ubuntu2.4 amd64 -libctf-nobfd0 2.34-6ubuntu1.9 amd64 -libctf0 2.34-6ubuntu1.9 amd64 +libcryptsetup12 2:2.2.2-3ubuntu2.5 amd64 +libctf-nobfd0 2.34-6ubuntu1.11 amd64 +libctf0 2.34-6ubuntu1.11 amd64 -libfcgi-perl 0.79-1 amd64 +libfcgi-perl 0.79-1ubuntu0.1 amd64 -libfreetype6 2.10.1-2ubuntu0.3 amd64 +libfreetype6 2.10.1-2ubuntu0.4 amd64 -libglib2.0-0 2.64.6-1~ubuntu20.04.8 amd64 -libglib2.0-data 2.64.6-1~ubuntu20.04.8 all +libglib2.0-0 2.64.6-1~ubuntu20.04.9 amd64 +libglib2.0-data 2.64.6-1~ubuntu20.04.9 all -libgnutls30 3.6.13-2ubuntu1.11 amd64 +libgnutls30 3.6.13-2ubuntu1.12 amd64 -libgs9 9.50~dfsg-5ubuntu4.14 amd64 -libgs9-common 9.50~dfsg-5ubuntu4.14 all +libgs9 9.50~dfsg-5ubuntu4.15 amd64 +libgs9-common 9.50~dfsg-5ubuntu4.15 all -libgssapi-krb5-2 1.17-6ubuntu4.8 amd64 +libgssapi-krb5-2 1.17-6ubuntu4.11 amd64 -libk5crypto3 1.17-6ubuntu4.8 amd64 +libk5crypto3 1.17-6ubuntu4.11 amd64 -libkrb5-3 1.17-6ubuntu4.8 amd64 -libkrb5support0 1.17-6ubuntu4.8 amd64 +libkrb5-3 1.17-6ubuntu4.11 amd64 +libkrb5support0 1.17-6ubuntu4.11 amd64 -libmagickcore-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11.10 amd64 -libmagickcore-6.q16-6-extra 8:6.9.10.23+dfsg-2.1ubuntu11.10 amd64 -libmagickwand-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11.10 amd64 +libmagickcore-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11.11 amd64 +libmagickcore-6.q16-6-extra 8:6.9.10.23+dfsg-2.1ubuntu11.11 amd64 +libmagickwand-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11.11 amd64 -libmysqlclient21 8.0.41-0ubuntu0.20.04.1 amd64 +libmysqlclient21 8.0.42-0ubuntu0.20.04.1 amd64 -libpam-cap 1:2.32-1ubuntu0.1 amd64 +libpam-cap 1:2.32-1ubuntu0.2 amd64 -libpq5 12.22-0ubuntu0.20.04.1 amd64 +libpq5 12.22-0ubuntu0.20.04.4 amd64 -libpython3.8 3.8.10-0ubuntu1~20.04.14 amd64 -libpython3.8-dev 3.8.10-0ubuntu1~20.04.14 amd64 -libpython3.8-minimal 3.8.10-0ubuntu1~20.04.14 amd64 -libpython3.8-stdlib 3.8.10-0ubuntu1~20.04.14 amd64 +libpython3.8 3.8.10-0ubuntu1~20.04.18 amd64 +libpython3.8-dev 3.8.10-0ubuntu1~20.04.18 amd64 +libpython3.8-minimal 3.8.10-0ubuntu1~20.04.18 amd64 +libpython3.8-stdlib 3.8.10-0ubuntu1~20.04.18 amd64 -libruby2.7 2.7.0-5ubuntu1.15 amd64 +libruby2.7 2.7.0-5ubuntu1.18 amd64 -libsoup2.4-1 2.70.0-1ubuntu0.1 amd64 +libsoup2.4-1 2.70.0-1ubuntu0.5 amd64 -libsqlite3-0 3.31.1-4ubuntu0.6 amd64 +libsqlite3-0 3.31.1-4ubuntu0.7 amd64 -libssl1.1 1.1.1f-1ubuntu2.23 amd64 +libssl1.1 1.1.1f-1ubuntu2.24 amd64 -libtasn1-6 4.16.0-2 amd64 +libtasn1-6 4.16.0-2ubuntu0.1 amd64 -libunbound8 1.9.4-2ubuntu1.9 amd64 +libunbound8 1.9.4-2ubuntu1.11 amd64 -libxml2 2.9.10+dfsg-5ubuntu0.20.04.8 amd64 +libxml2 2.9.10+dfsg-5ubuntu0.20.04.10 amd64 -libxslt1.1 1.1.34-4ubuntu0.20.04.1 amd64 +libxslt1.1 1.1.34-4ubuntu0.20.04.3 amd64 -linux-generic 5.4.0.205.201 amd64 +linux-generic 5.4.0.216.208 amd64 -linux-headers-generic 5.4.0.205.201 amd64 +linux-headers-5.4.0-216 5.4.0-216.236 all +linux-headers-5.4.0-216-generic 5.4.0-216.236 amd64 +linux-headers-generic 5.4.0.216.208 amd64 +linux-image-5.4.0-216-generic 5.4.0-216.236 amd64 -linux-image-generic 5.4.0.205.201 amd64 -linux-libc-dev 5.4.0-205.225 amd64 +linux-image-generic 5.4.0.216.208 amd64 +linux-libc-dev 5.4.0-216.236 amd64 +linux-modules-5.4.0-216-generic 5.4.0-216.236 amd64 +linux-modules-extra-5.4.0-216-generic 5.4.0-216.236 amd64 -locales 2.31-0ubuntu9.16 all +locales 2.31-0ubuntu9.18 all -mysql-client-8.0 8.0.41-0ubuntu0.20.04.1 amd64 -mysql-client-core-8.0 8.0.41-0ubuntu0.20.04.1 amd64 +mysql-client-8.0 8.0.42-0ubuntu0.20.04.1 amd64 +mysql-client-core-8.0 8.0.42-0ubuntu0.20.04.1 amd64 -mysql-server 8.0.41-0ubuntu0.20.04.1 all -mysql-server-8.0 8.0.41-0ubuntu0.20.04.1 amd64 -mysql-server-core-8.0 8.0.41-0ubuntu0.20.04.1 amd64 +mysql-server 8.0.42-0ubuntu0.20.04.1 all +mysql-server-8.0 8.0.42-0ubuntu0.20.04.1 amd64 +mysql-server-core-8.0 8.0.42-0ubuntu0.20.04.1 amd64 -net-tools 1.60+git20180626.aebd88e-1ubuntu1 amd64 +net-tools 1.60+git20180626.aebd88e-1ubuntu1.3 amd64 -openssh-client 1:8.2p1-4ubuntu0.11 amd64 -openssh-server 1:8.2p1-4ubuntu0.11 amd64 -openssh-sftp-server 1:8.2p1-4ubuntu0.11 amd64 -openssl 1.1.1f-1ubuntu2.23 amd64 +openssh-client 1:8.2p1-4ubuntu0.13 amd64 +openssh-server 1:8.2p1-4ubuntu0.13 amd64 +openssh-sftp-server 1:8.2p1-4ubuntu0.13 amd64 +openssl 1.1.1f-1ubuntu2.24 amd64 -php7.4 7.4.3-4ubuntu2.28 all -php7.4-bcmath 7.4.3-4ubuntu2.28 amd64 -php7.4-bz2 7.4.3-4ubuntu2.28 amd64 -php7.4-cli 7.4.3-4ubuntu2.28 amd64 -php7.4-common 7.4.3-4ubuntu2.28 amd64 -php7.4-curl 7.4.3-4ubuntu2.28 amd64 -php7.4-gd 7.4.3-4ubuntu2.28 amd64 -php7.4-gmp 7.4.3-4ubuntu2.28 amd64 -php7.4-intl 7.4.3-4ubuntu2.28 amd64 -php7.4-json 7.4.3-4ubuntu2.28 amd64 -php7.4-ldap 7.4.3-4ubuntu2.28 amd64 -php7.4-mbstring 7.4.3-4ubuntu2.28 amd64 -php7.4-mysql 7.4.3-4ubuntu2.28 amd64 -php7.4-opcache 7.4.3-4ubuntu2.28 amd64 -php7.4-pgsql 7.4.3-4ubuntu2.28 amd64 -php7.4-phpdbg 7.4.3-4ubuntu2.28 amd64 -php7.4-readline 7.4.3-4ubuntu2.28 amd64 -php7.4-soap 7.4.3-4ubuntu2.28 amd64 -php7.4-xml 7.4.3-4ubuntu2.28 amd64 -php7.4-zip 7.4.3-4ubuntu2.28 amd64 +php7.4 7.4.3-4ubuntu2.29 all +php7.4-bcmath 7.4.3-4ubuntu2.29 amd64 +php7.4-bz2 7.4.3-4ubuntu2.29 amd64 +php7.4-cli 7.4.3-4ubuntu2.29 amd64 +php7.4-common 7.4.3-4ubuntu2.29 amd64 +php7.4-curl 7.4.3-4ubuntu2.29 amd64 +php7.4-gd 7.4.3-4ubuntu2.29 amd64 +php7.4-gmp 7.4.3-4ubuntu2.29 amd64 +php7.4-intl 7.4.3-4ubuntu2.29 amd64 +php7.4-json 7.4.3-4ubuntu2.29 amd64 +php7.4-ldap 7.4.3-4ubuntu2.29 amd64 +php7.4-mbstring 7.4.3-4ubuntu2.29 amd64 +php7.4-mysql 7.4.3-4ubuntu2.29 amd64 +php7.4-opcache 7.4.3-4ubuntu2.29 amd64 +php7.4-pgsql 7.4.3-4ubuntu2.29 amd64 +php7.4-phpdbg 7.4.3-4ubuntu2.29 amd64 +php7.4-readline 7.4.3-4ubuntu2.29 amd64 +php7.4-soap 7.4.3-4ubuntu2.29 amd64 +php7.4-xml 7.4.3-4ubuntu2.29 amd64 +php7.4-zip 7.4.3-4ubuntu2.29 amd64 -python3-django 2:2.2.12-1ubuntu0.27 all +python3-django 2:2.2.12-1ubuntu0.29 all -python3-jinja2 2.10.1-2ubuntu0.4 all +python3-jinja2 2.10.1-2ubuntu0.6 all -python3-pkg-resources 45.2.0-1ubuntu0.2 all +python3-pkg-resources 45.2.0-1ubuntu0.3 all -python3-setuptools 45.2.0-1ubuntu0.2 all +python3-setuptools 45.2.0-1ubuntu0.3 all -python3.8 3.8.10-0ubuntu1~20.04.14 amd64 -python3.8-dev 3.8.10-0ubuntu1~20.04.14 amd64 -python3.8-minimal 3.8.10-0ubuntu1~20.04.14 amd64 +python3.8 3.8.10-0ubuntu1~20.04.18 amd64 +python3.8-dev 3.8.10-0ubuntu1~20.04.18 amd64 +python3.8-minimal 3.8.10-0ubuntu1~20.04.18 amd64 -ruby2.7 2.7.0-5ubuntu1.15 amd64 +ruby2.7 2.7.0-5ubuntu1.18 amd64 -snapd 2.66.1+20.04 amd64 +snapd 2.67.1+20.04 amd64 -sqlite3 3.31.1-4ubuntu0.6 amd64 +sqlite3 3.31.1-4ubuntu0.7 amd64 -tzdata 2024b-0ubuntu0.20.04 all -ubuntu-advantage-tools 34~20.04 all +tzdata 2025b-0ubuntu0.20.04.1 all +ubuntu-advantage-tools 35.1ubuntu0~20.04 all -ubuntu-pro-client 34~20.04 amd64 -ubuntu-pro-client-l10n 34~20.04 amd64 +ubuntu-pro-client 35.1ubuntu0~20.04 amd64 +ubuntu-pro-client-l10n 35.1ubuntu0~20.04 amd64 -vim 2:8.1.2269-1ubuntu5.30 amd64 +vim 2:8.1.2269-1ubuntu5.32 amd64 -vim-common 2:8.1.2269-1ubuntu5.30 all +vim-common 2:8.1.2269-1ubuntu5.32 all -vim-runtime 2:8.1.2269-1ubuntu5.30 all -vim-tiny 2:8.1.2269-1ubuntu5.30 amd64 +vim-runtime 2:8.1.2269-1ubuntu5.32 all +vim-tiny 2:8.1.2269-1ubuntu5.32 amd64 -webmin 2.202 all +webmin 2.401 all -xxd 2:8.1.2269-1ubuntu5.30 amd64 +xxd 2:8.1.2269-1ubuntu5.32 amd64 --- .etckeeper | 2 ++ apparmor.d/ubuntu_pro_apt_news | 6 +++++- apt/apt.conf.d/20apt-esm-hook.conf | 2 +- coolwsd/coolkitconfig.xcu | 3 +++ letsencrypt/.certbot.lock | 0 mailcap | 1 + mysql/FROZEN | 1 + systemd/system/snap.certbot.renew.timer | 4 ++-- webmin/apache/httpd-info | 6 +++--- webmin/config | 1 + webmin/cron/cleanup.pl | 13 +++++++++++++ webmin/miniserv.conf | 3 ++- webmin/mysql/version | 2 +- webmin/useradmin/config | 1 + webmin/version | 2 +- webmin/webmin/config | 1 + webmin/xterm/config | 1 + 17 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 letsencrypt/.certbot.lock create mode 120000 mysql/FROZEN create mode 100755 webmin/cron/cleanup.pl diff --git a/.etckeeper b/.etckeeper index fc8e62f16..5c37f777d 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1661,6 +1661,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' @@ -21424,6 +21425,7 @@ maybe chgrp 'bin' 'webmin/cpan/config' maybe chmod 0600 'webmin/cpan/config' maybe chgrp 'bin' 'webmin/cron' maybe chmod 0711 'webmin/cron' +maybe chmod 0755 'webmin/cron/cleanup.pl' maybe chgrp 'bin' 'webmin/cron/config' maybe chmod 0600 'webmin/cron/config' maybe chgrp 'bin' 'webmin/custom' diff --git a/apparmor.d/ubuntu_pro_apt_news b/apparmor.d/ubuntu_pro_apt_news index a07d06ee3..d54915170 100644 --- a/apparmor.d/ubuntu_pro_apt_news +++ b/apparmor.d/ubuntu_pro_apt_news @@ -17,6 +17,9 @@ profile ubuntu_pro_apt_news flags=(attach_disconnected) { capability dac_read_search, # GH: 3079 capability dac_override, + capability kill, + capability chown, + capability fowner, /etc/apt/** r, /etc/default/apport r, @@ -39,7 +42,8 @@ profile ubuntu_pro_apt_news flags=(attach_disconnected) { /var/lib/ubuntu-advantage/messages/ rw, /var/lib/ubuntu-advantage/messages/* rw, /run/ubuntu-advantage/ rw, - /run/ubuntu-advantage/* rw, + /run/ubuntu-advantage/apt-news/ rw, + /run/ubuntu-advantage/apt-news/* rw, # LP: #2072489 # the apt-news package selector needs access to packaging information diff --git a/apt/apt.conf.d/20apt-esm-hook.conf b/apt/apt.conf.d/20apt-esm-hook.conf index 163853b11..8e6ddf46c 100644 --- a/apt/apt.conf.d/20apt-esm-hook.conf +++ b/apt/apt.conf.d/20apt-esm-hook.conf @@ -3,5 +3,5 @@ APT::Update::Pre-Invoke { }; binary::apt::AptCli::Hooks::Upgrade { - "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-json-hook ] || /usr/lib/ubuntu-advantage/apt-esm-json-hook 2>> /var/log/ubuntu-advantage-apt-hook.log || true"; + "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-json-hook ] || [ $(id -u) -ne 0 ] || /usr/lib/ubuntu-advantage/apt-esm-json-hook 2>> /var/log/ubuntu-advantage-apt-hook.log || true"; }; diff --git a/coolwsd/coolkitconfig.xcu b/coolwsd/coolkitconfig.xcu index ce4d0ac4f..9fb651eac 100644 --- a/coolwsd/coolkitconfig.xcu +++ b/coolwsd/coolkitconfig.xcu @@ -1,6 +1,9 @@ + +2 + false diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock new file mode 100644 index 000000000..e69de29bb diff --git a/mailcap b/mailcap index 745074fd5..acb29b768 100644 --- a/mailcap +++ b/mailcap @@ -58,6 +58,7 @@ text/html; /usr/bin/lynx -force_html %s; needsterminal; description=HTML Text; n application/zip; unzip -l %s; nametemplate=%s.zip; copiousoutput text/plain; view %s; edit=vi %s; compose=vi %s; needsterminal text/html; /usr/bin/w3m -I %{charset} -dump -T text/html %s; copiousoutput; description=HTML Text; nametemplate=%s.html +text/html; /usr/bin/html2text '%s'; copiousoutput; description=HTML Text text/html; /usr/bin/lynx -dump -force_html %s; copiousoutput; description=HTML Text; nametemplate=%s.html application/x-troff-man; /usr/bin/man -Tascii -l '%s' | col -b; copiousoutput; description=Man page text/troff; /usr/bin/man -Tascii -l '%s' | col -b; copiousoutput; description=Man page diff --git a/mysql/FROZEN b/mysql/FROZEN new file mode 120000 index 000000000..2bc63aea9 --- /dev/null +++ b/mysql/FROZEN @@ -0,0 +1 @@ +../../usr/share/doc/mysql-common/frozen-mode/downgrade \ No newline at end of file diff --git a/systemd/system/snap.certbot.renew.timer b/systemd/system/snap.certbot.renew.timer index 51b60e398..dce9e5c52 100644 --- a/systemd/system/snap.certbot.renew.timer +++ b/systemd/system/snap.certbot.renew.timer @@ -7,8 +7,8 @@ X-Snappy=yes [Timer] Unit=snap.certbot.renew.service -OnCalendar=*-*-* 04:01 -OnCalendar=*-*-* 21:04 +OnCalendar=*-*-* 05:57 +OnCalendar=*-*-* 20:57 [Install] WantedBy=timers.target diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info index b88ea28d8..90b0fb83e 100644 --- a/webmin/apache/httpd-info +++ b/webmin/apache/httpd-info @@ -1,5 +1,5 @@ -time=1721651792 +time=1741354796 cmd=/usr/sbin/apache2 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd -version=2.462 -fullversion=2.4.62 +version=2.463 +fullversion=2.4.63 diff --git a/webmin/config b/webmin/config index 60c221121..d2f33d56f 100644 --- a/webmin/config +++ b/webmin/config @@ -31,3 +31,4 @@ real_os_type=Ubuntu Linux hostnamemode=0 real_os_version=18.04.1 noselfwebminup=1 +md5pass=0 diff --git a/webmin/cron/cleanup.pl b/webmin/cron/cleanup.pl new file mode 100755 index 000000000..ea5e98514 --- /dev/null +++ b/webmin/cron/cleanup.pl @@ -0,0 +1,13 @@ +#!/usr/bin/perl +open(CONF, ") { + $root = $1 if (/^root=(.*)/); + } +close(CONF); +$root || die "No root= line found in /etc/webmin/miniserv.conf"; +$ENV{'PERLLIB'} = "$root"; +$ENV{'WEBMIN_CONFIG'} = "/etc/webmin"; +$ENV{'WEBMIN_VAR'} = "/var/webmin"; +delete($ENV{'MINISERV_CONFIG'}); +chdir("$root/cron"); +exec("$root/cron/cleanup.pl", @ARGV) || die "Failed to run $root/cron/cleanup.pl : $!"; diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf index 783daf429..105b6da95 100644 --- a/webmin/miniserv.conf +++ b/webmin/miniserv.conf @@ -47,4 +47,5 @@ error_handler_404=404.cgi error_handler_401=401.cgi root=/usr/share/webmin mimetypes=/usr/share/webmin/mime.types -server=MiniServ/2.202 +server=MiniServ/2.401 +no_trust_ssl=1 diff --git a/webmin/mysql/version b/webmin/mysql/version index e71e69953..aa37c147f 100644 --- a/webmin/mysql/version +++ b/webmin/mysql/version @@ -1 +1 @@ -8.0.39-0ubuntu0 +8.0.42-0ubuntu0 diff --git a/webmin/useradmin/config b/webmin/useradmin/config index fed989bbd..31ef32e33 100644 --- a/webmin/useradmin/config +++ b/webmin/useradmin/config @@ -39,3 +39,4 @@ from_files=0 skip_md5=0 shadow_file=/etc/shadow default_group=users +last_count=1000 diff --git a/webmin/version b/webmin/version index 62d15f9fa..e9dccaff8 100644 --- a/webmin/version +++ b/webmin/version @@ -1 +1 @@ -2.202 +2.401 diff --git a/webmin/webmin/config b/webmin/webmin/config index c1bee7a1a..aa3c46ba1 100644 --- a/webmin/webmin/config +++ b/webmin/webmin/config @@ -12,3 +12,4 @@ upmins=47 upmissing=0 letsencrypt_algo=rsa letsencrypt_reuse=1 +letsencrypt_nouse=0 diff --git a/webmin/xterm/config b/webmin/xterm/config index f45af7b0c..eda8b6ce7 100644 --- a/webmin/xterm/config +++ b/webmin/xterm/config @@ -3,3 +3,4 @@ base_port=555 xterm=xterm-256color locale=0 screen_reader=false +fontsize=15 -- 2.43.0