committing changes in /etc made by "apt-get upgrade"

Package changes:
-code-brand 6.4-11 all
-collaboraoffice6.4 6.4.10.28-28 amd64
-collaboraoffice6.4-ure 6.4.10.28-28 amd64
+code-brand 6.4-12 all
+collaboraoffice6.4 6.4.10.31-31 amd64
+collaboraoffice6.4-ure 6.4.10.31-31 amd64
-collaboraofficebasis6.4-calc 6.4.10.28-28 amd64
-collaboraofficebasis6.4-core 6.4.10.28-28 amd64
-collaboraofficebasis6.4-draw 6.4.10.28-28 amd64
-collaboraofficebasis6.4-en-us 6.4.10.28-28 amd64
-collaboraofficebasis6.4-extension-pdf-import 6.4.10.28-28 amd64
-collaboraofficebasis6.4-graphicfilter 6.4.10.28-28 amd64
-collaboraofficebasis6.4-images 6.4.10.28-28 amd64
-collaboraofficebasis6.4-impress 6.4.10.28-28 amd64
-collaboraofficebasis6.4-ooofonts 6.4.10.28-28 amd64
-collaboraofficebasis6.4-ooolinguistic 6.4.10.28-28 amd64
-collaboraofficebasis6.4-writer 6.4.10.28-28 amd64
+collaboraofficebasis6.4-calc 6.4.10.31-31 amd64
+collaboraofficebasis6.4-core 6.4.10.31-31 amd64
+collaboraofficebasis6.4-draw 6.4.10.31-31 amd64
+collaboraofficebasis6.4-en-us 6.4.10.31-31 amd64
+collaboraofficebasis6.4-extension-pdf-import 6.4.10.31-31 amd64
+collaboraofficebasis6.4-graphicfilter 6.4.10.31-31 amd64
+collaboraofficebasis6.4-images 6.4.10.31-31 amd64
+collaboraofficebasis6.4-impress 6.4.10.31-31 amd64
+collaboraofficebasis6.4-ooofonts 6.4.10.31-31 amd64
+collaboraofficebasis6.4-ooolinguistic 6.4.10.31-31 amd64
+collaboraofficebasis6.4-writer 6.4.10.31-31 amd64
-isc-dhcp-client 4.4.1-2.1ubuntu5 amd64
-isc-dhcp-common 4.4.1-2.1ubuntu5 amd64
+isc-dhcp-client 4.4.1-2.1ubuntu5.20.04.1 amd64
+isc-dhcp-common 4.4.1-2.1ubuntu5.20.04.1 amd64
-linux-libc-dev 5.4.0-67.75 amd64
+linux-libc-dev 5.4.0-70.78 amd64
-loolwsd 6.4.6-8 amd64
+loolwsd 6.4.7-3 amd64

diff --git a/.etckeeper b/.etckeeper
index 2a278ad4f890a176ceee7c02ec4604abcc32d149..33655318d71869506735969c35c149e6b25ae16d 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1562,6 +1562,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/loolwsd/loolkitconfig.xcu b/loolwsd/loolkitconfig.xcu
index 593639de4f136255cc2af5a722512d740c767fb8..1e1fe79a823d05659b211a2aae75a45ba0a53364 100644 (file)
--- a/loolwsd/loolkitconfig.xcu
+++ b/loolwsd/loolkitconfig.xcu
@@ -19,9 +19,6 @@
 <!-- Save memory by avoiding collecting autocompletion words  -->
 <item oor:path="/org.openoffice.Office.Writer/AutoFunction/Completion"><prop oor:name="Enable" oor:op="fuse"><value>false</value></prop></item>
 
-<!-- Set MacroSecurityLevel 1 -->
-+<item oor:path="/org.openoffice.Office.Common/Security/Scripting"><prop oor:name="MacroSecurityLevel" oor:op="fuse"><value>1</value></prop></item>
-
 <!-- Set a work path which is valid in chroot -->
 <item oor:path="/org.openoffice.Office.Paths/Variables"><prop oor:name="Work" oor:op="fuse"><value>file:///tmp</value></prop></item>