committing changes in /etc made by "apt upgrade"

author mhoellein <mario@hoellein.online>

Fri, 13 Jun 2025 08:11:45 +0000 (10:11 +0200)

committer mhoellein <mario@hoellein.online>

Fri, 13 Jun 2025 08:11:45 +0000 (10:11 +0200)
author mhoellein <mario@hoellein.online>
Fri, 13 Jun 2025 08:11:45 +0000 (10:11 +0200)
committer mhoellein <mario@hoellein.online>
Fri, 13 Jun 2025 08:11:45 +0000 (10:11 +0200)
diff --git a/.etckeeper b/.etckeeper

index fc8e62f166817a27ed55376043c3f39a64f643eb..5c37f777d70c715be29874c46b163817b4e0f7f7 100755 (executable)
--- 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 a07d06ee3351a1ca5aac9e5ee99bb6c37595d5d5..d549151708495f32fb8ff66d3b0edf0a4f549d7e 100644 (file)
--- 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 163853b115737fbca65ce4302a8e00bca524cffe..8e6ddf46c4cc9b41b917d98d19f73d9aed31f4eb 100644 (file)
--- 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 ce4d0ac4fe2ca44baa45acf17d645b2a2b29c05f..9fb651eac05ad7fef93ee3ebbfba1e492939332e 100644 (file)
--- a/coolwsd/coolkitconfig.xcu
+++ b/coolwsd/coolkitconfig.xcu
@@ -1,6 +1,9 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  
+<!-- Disable (0) or Enable (2) exotic file formats like .123, .wks -->
+<item oor:path="/org.openoffice.Office.Common/Security"><prop oor:name="LoadExoticFileFormats" oor:op="fuse"><value>2</value></prop></item>
+
  <!-- tdf#106488 - reverse hostname lookup can go badly wrong -->
  <item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="UseLocking" oor:op="fuse"><value>false</value></prop></item>
  
diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock

new file mode 100644 (file)

index 0000000..e69de29
diff --git a/mailcap b/mailcap

index 745074fd519b8ee0a9164f19b8acc7afcaba48ab..acb29b768a0d5c0a83dae43c89803a541c027742 100644 (file)
--- 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 (symlink)

index 0000000..2bc63ae
--- /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 51b60e398c6edceaf6830d35457c9ce902c4c5aa..dce9e5c52b46f86168e0087be5e4b09cea695700 100644 (file)
--- 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 b88ea28d81ff59c6cd7a09c125ec1b2982f86fe5..90b0fb83e2e88bec7968cd9ba5b37c191d95418d 100644 (file)
--- 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 60c221121331cbdc3db1763df6d0cf798d8f0a2b..d2f33d56f1ee69146e1ba2718453d2d36dc868c2 100644 (file)
--- 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 (executable)

index 0000000..ea5e985
--- /dev/null
+++ b/webmin/cron/cleanup.pl
@@ -0,0 +1,13 @@
+#!/usr/bin/perl
+open(CONF, "</etc/webmin/miniserv.conf") || die "Failed to open /etc/webmin/miniserv.conf : $!";
+while(<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 783daf429bed1732167a34fff9bc03ee4ff2ece5..105b6da951ed3f2549e504c7e91b684701aa79f6 100644 (file)
--- 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 e71e6995329cbb9bc9d8d241a845d536dca50390..aa37c147fe6f4a7ffde3af0e19f8c94246bd1f5e 100644 (file)
--- 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 fed989bbd86b696112d4b9453ec95ebc872527f7..31ef32e338137932b35ed815ae788fa5789af6f6 100644 (file)
--- 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 62d15f9fa127c5db0fecd9f529291f13d205c4a1..e9dccaff84a002bfa98d369c3fd80d367ae1bdbf 100644 (file)
--- a/webmin/version
+++ b/webmin/version
@@ -1 +1 @@
-2.202
+2.401
diff --git a/webmin/webmin/config b/webmin/webmin/config

index c1bee7a1a4381ac9c2746e205f907849aca2df09..aa3c46ba1f5c2664a9a6d1239f704d2beef73625 100644 (file)
--- 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 f45af7b0c63da7f84d87cfde3d79e02dbc8f32a5..eda8b6ce7c7f8d09b10e3cd2112626161d5d20cf 100644 (file)
--- 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
author	mhoellein <mario@hoellein.online>
	Fri, 13 Jun 2025 08:11:45 +0000 (10:11 +0200)
committer	mhoellein <mario@hoellein.online>
	Fri, 13 Jun 2025 08:11:45 +0000 (10:11 +0200)
.etckeeper		patch \| blob \| history
apparmor.d/ubuntu_pro_apt_news		patch \| blob \| history
apt/apt.conf.d/20apt-esm-hook.conf		patch \| blob \| history
coolwsd/coolkitconfig.xcu		patch \| blob \| history
letsencrypt/.certbot.lock	[new file with mode: 0644]	patch \| blob
mailcap		patch \| blob \| history
mysql/FROZEN	[new symlink]	patch \| blob
systemd/system/snap.certbot.renew.timer		patch \| blob \| history
webmin/apache/httpd-info		patch \| blob \| history
webmin/config		patch \| blob \| history
webmin/cron/cleanup.pl	[new file with mode: 0755]	patch \| blob
webmin/miniserv.conf		patch \| blob \| history
webmin/mysql/version		patch \| blob \| history
webmin/useradmin/config		patch \| blob \| history
webmin/version		patch \| blob \| history
webmin/webmin/config		patch \| blob \| history
webmin/xterm/config		patch \| blob \| history