committing changes in /etc made by "apt-get install linux-generic linux-headers-gener...

Package changes:
+libalgorithm-c3-perl 0.10-1 all
+libb-hooks-endofscope-perl 0.24-1 all
+libb-hooks-op-check-perl 0.22-1build2 amd64
+libclass-c3-perl 0.34-1 all
+libclass-c3-xs-perl 0.14-1build5 amd64
+libclass-data-inheritable-perl 0.08-3 all
+libclass-inspector-perl 1.36-1 all
+libclass-method-modifiers-perl 2.13-1 all
+libclass-singleton-perl 1.5-1 all
+libclass-xsaccessor-perl 1.19-3build3 amd64
+libdata-optlist-perl 0.110-1 all
+libdatetime-locale-perl 1:1.25-1 all
+libdatetime-perl 2:1.51-1build1 amd64
+libdatetime-timezone-perl 1:2.38-1+2019c all
+libdevel-callchecker-perl 0.008-1ubuntu1 amd64
+libdevel-caller-perl 2.06-2build2 amd64
+libdevel-lexalias-perl 0.05-2build2 amd64
+libdevel-stacktrace-perl 2.0400-1 all
+libdynaloader-functions-perl 0.003-1 all
+libeval-closure-perl 0.14-1 all
+libexception-class-perl 1.44-1 all
+libfile-sharedir-perl 1.116-2 all
+libmodule-implementation-perl 0.09-1 all
+libmodule-runtime-perl 0.016-1 all
+libmro-compat-perl 0.13-1 all
+libnamespace-autoclean-perl 0.29-1 all
+libnamespace-clean-perl 0.27-1 all
+libpackage-stash-perl 0.38-1 all
+libpackage-stash-xs-perl 0.29-1build1 amd64
+libpadwalker-perl 2.3-1build2 amd64
+libparams-classify-perl 0.015-1build2 amd64
+libparams-util-perl 1.07-3build5 amd64
+libparams-validationcompiler-perl 0.30-1 all
+libreadonly-perl 2.050-2 all
+libref-util-perl 0.204-1 all
+libref-util-xs-perl 0.117-1build2 amd64
+librole-tiny-perl 2.001004-1 all
+libspecio-perl 0.45-1 all
+libsub-exporter-perl 0.987-1 all
+libsub-exporter-progressive-perl 0.001013-1 all
+libsub-identify-perl 0.14-1build2 amd64
+libsub-install-perl 0.928-1 all
+libsub-quote-perl 2.006006-1 all
+libtry-tiny-perl 0.30-1 all
+libvariable-magic-perl 0.62-1build2 amd64
+libxstring-perl 0.002-2 amd64
-linux-generic 5.4.0.139.137 amd64
+linux-generic 5.4.0.146.144 amd64
+linux-headers-5.4.0-146 5.4.0-146.163 all
+linux-headers-5.4.0-146-generic 5.4.0-146.163 amd64
-linux-headers-generic 5.4.0.139.137 amd64
+linux-headers-generic 5.4.0.146.144 amd64
+linux-image-5.4.0-146-generic 5.4.0-146.163 amd64
-linux-image-generic 5.4.0.139.137 amd64
+linux-image-generic 5.4.0.146.144 amd64
+linux-modules-5.4.0-146-generic 5.4.0-146.163 amd64
+linux-modules-extra-5.4.0-146-generic 5.4.0-146.163 amd64
-webmin 2.013 all
+webmin 2.021 all

diff --git a/.etckeeper b/.etckeeper
index 88d92e6b181b9afa678950ac935bea2c957d649f..0319914a161493a01bdbabb6926ca99cfe419714 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1626,6 +1626,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/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/webmin/.stop-init b/webmin/.stop-init
index 7df1f6c4a6208ba532e79dcca0375796689c3e7c..351ad66384fb0c08d7a41af90c12af766a6f761e 100755 (executable)
--- a/webmin/.stop-init
+++ b/webmin/.stop-init
@@ -11,11 +11,11 @@ if [ "$pid" != "" ]; then
   touch /var/webmin/stop-flag
   if [ "$1" = "--kill" ]; then
     sleep 1
-    ((ps axf | grep "/usr/share/webmin\/miniserv\.pl" | awk '{print "kill -9 -- -" $1}' | bash) || kill -9 -- -$pid || kill -9 $pid) 2>/dev/null
+    (ps axf | grep "/usr/share/webmin\/miniserv\.pl" | awk '{print "kill -9 -- -" $1}' | bash ; kill -9 -- -$pid ; kill -9 $pid) 2>/dev/null
   fi
   exit 0
 else
   if [ "$1" = "--kill" ]; then
-    (ps axf | grep "/usr/share/webmin\/miniserv\.pl" | awk '{print "kill -9 -- -" $1}' | bash) 2>/dev/null
+    (ps axf | grep "/usr/share/webmin\/miniserv\.pl" | awk '{print "kill -9 -- -" $1}' | bash ; kill -9 -- -$pid ; kill -9 $pid) 2>/dev/null
   fi
 fi

diff --git a/webmin/apache/httpd-info b/webmin/apache/httpd-info
index a580ca71336d754879035a522262c3057f460383..3437d72efbee1158dbd9c00c5f0f88acd200fe00 100644 (file)
--- a/webmin/apache/httpd-info
+++ b/webmin/apache/httpd-info
@@ -1,5 +1,5 @@
-time=1674158114
+time=1678347255
 cmd=/usr/sbin/apache2
 mods=core mod_so mod_watchdog http_core mod_log_config mod_logio mod_version mod_unixd
-version=2.455
-fullversion=2.4.55
+version=2.456
+fullversion=2.4.56

diff --git a/webmin/miniserv.conf b/webmin/miniserv.conf
index d9436f6ed2cad3f53549e640c8e3450f46acc573..2e736058928771bccd1a78da85cbc88a294baa5a 100644 (file)
--- a/webmin/miniserv.conf
+++ b/webmin/miniserv.conf
@@ -47,4 +47,4 @@ error_handler_404=404.cgi
 error_handler_401=401.cgi
 root=/usr/share/webmin
 mimetypes=/usr/share/webmin/mime.types
-server=MiniServ/2.013
+server=MiniServ/2.021

diff --git a/webmin/mysql/config b/webmin/mysql/config
index 39177ef09e29801f9fbc7cbd36ea632b4b6fdde2..84814d84748f07c2471c13f506cc312ce96348f0 100644 (file)
--- a/webmin/mysql/config
+++ b/webmin/mysql/config
@@ -21,3 +21,4 @@ mysqlshow=/usr/bin/mysqlshow
 perpage=25
 date_subs=0
 my_cnf=/etc/mysql/mysql.conf.d/mysqld.cnf
+ssl=0

diff --git a/webmin/version b/webmin/version
index 0eaf57ede01ff5a9495c9461187f1237b939024f..39b07564c188b9cc897b6122c53480e74496e4c6 100644 (file)
--- a/webmin/version
+++ b/webmin/version
@@ -1 +1 @@
-2.013
+2.021

diff --git a/webmin/webmin/config b/webmin/webmin/config
index 5bfc1b6510bc4086e860ccab6e9a8d61a27af588..a9472ed3d5a03c88e0ca11900bda78db34acf805 100644 (file)
--- a/webmin/webmin/config
+++ b/webmin/webmin/config
@@ -10,3 +10,4 @@ last_version_number=1.900
 letsencrypt_dns_wait=10
 upmins=47
 upmissing=0
+letsencrypt_algo=rsa