]> git.hoellein.online Git - vserver/commitdiff
projects / vserver / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d946bab)
committing changes in /etc made by "apt-get upgrade linux-generic linux-headers-gener...
authormhoellein <mario@hoellein.online>
Fri, 25 Sep 2020 06:20:12 +0000 (08:20 +0200)
committermhoellein <mario@hoellein.online>
Fri, 25 Sep 2020 06:20:12 +0000 (08:20 +0200)
Package changes:
+collaboraoffice6.4 6.4.10.5-5 amd64
+collaboraoffice6.4-ure 6.4.10.5-5 amd64
+collaboraofficebasis6.4-calc 6.4.10.5-5 amd64
+collaboraofficebasis6.4-core 6.4.10.5-5 amd64
+collaboraofficebasis6.4-draw 6.4.10.5-5 amd64
+collaboraofficebasis6.4-en-us 6.4.10.5-5 amd64
+collaboraofficebasis6.4-extension-pdf-import 6.4.10.5-5 amd64
+collaboraofficebasis6.4-graphicfilter 6.4.10.5-5 amd64
+collaboraofficebasis6.4-images 6.4.10.5-5 amd64
+collaboraofficebasis6.4-impress 6.4.10.5-5 amd64
+collaboraofficebasis6.4-ooofonts 6.4.10.5-5 amd64
+collaboraofficebasis6.4-ooolinguistic 6.4.10.5-5 amd64
+collaboraofficebasis6.4-writer 6.4.10.5-5 amd64
-linux-generic 5.4.0.40.43 amd64
+linux-generic 5.4.0.48.51 amd64
-linux-headers-generic 5.4.0.40.43 amd64
+linux-headers-5.4.0-48 5.4.0-48.52 all
+linux-headers-5.4.0-48-generic 5.4.0-48.52 amd64
+linux-headers-generic 5.4.0.48.51 amd64
-linux-image-generic 5.4.0.40.43 amd64
+linux-image-5.4.0-48-generic 5.4.0-48.52 amd64
+linux-image-generic 5.4.0.48.51 amd64
+linux-modules-5.4.0-48-generic 5.4.0-48.52 amd64
+linux-modules-extra-5.4.0-48-generic 5.4.0-48.52 amd64
-loolwsd 4.2.6-2 amd64
+loolwsd 6.4.0-2 amd64

.etckeeper patch | blob | history
apt/apt.conf.d/01autoremove-kernels patch | blob | history
apt/apt.conf.d/25loolwsd patch | blob | history
letsencrypt/.certbot.lock [new file with mode: 0644] patch | blob
loolwsd/loolkitconfig.xcu patch | blob | history
myssl/dh2048.pem patch | blob | history

diff --git a/.etckeeper b/.etckeeper
index 55dd22faeff0276a4d7db230e2758485ccbf67e4..2b8033c067d9f26f9f53fba308c41c97b6be9fba 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1561,6 +1561,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/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
index 0ce4acfbdecc7225b881d83a0ed19624ee88c7a2..899cc4c5f2e8745b81093a77ed13e7ee2437779d 100644 (file)
--- a/apt/apt.conf.d/01autoremove-kernels
+++ b/apt/apt.conf.d/01autoremove-kernels
@@ -1,47 +1,41 @@
 // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal
 APT::NeverAutoRemove
 {
-   "^linux-.*-4\.15\.0-109-generic$";
-   "^linux-.*-4\.15\.0-64-generic$";
    "^linux-.*-5\.4\.0-40-generic$";
-   "^kfreebsd-.*-4\.15\.0-109-generic$";
-   "^kfreebsd-.*-4\.15\.0-64-generic$";
+   "^linux-.*-5\.4\.0-48-generic$";
    "^kfreebsd-.*-5\.4\.0-40-generic$";
-   "^gnumach-.*-4\.15\.0-109-generic$";
-   "^gnumach-.*-4\.15\.0-64-generic$";
+   "^kfreebsd-.*-5\.4\.0-48-generic$";
    "^gnumach-.*-5\.4\.0-40-generic$";
-   "^.*-modules-4\.15\.0-109-generic$";
-   "^.*-modules-4\.15\.0-64-generic$";
+   "^gnumach-.*-5\.4\.0-48-generic$";
    "^.*-modules-5\.4\.0-40-generic$";
-   "^.*-kernel-4\.15\.0-109-generic$";
-   "^.*-kernel-4\.15\.0-64-generic$";
+   "^.*-modules-5\.4\.0-48-generic$";
    "^.*-kernel-5\.4\.0-40-generic$";
+   "^.*-kernel-5\.4\.0-48-generic$";
 };
 /* Debug information:
 # dpkg list:
-ii  linux-image-4.15.0-109-generic               4.15.0-109.110                        amd64        Signed kernel image generic
+rc  linux-image-4.15.0-109-generic               4.15.0-109.110                        amd64        Signed kernel image generic
 rc  linux-image-4.15.0-38-generic                4.15.0-38.41                          amd64        Signed kernel image generic
 ii  linux-image-4.15.0-64-generic                4.15.0-64.73                          amd64        Signed kernel image generic
-iF  linux-image-5.4.0-40-generic                 5.4.0-40.44                           amd64        Signed kernel image generic
-ii  linux-image-generic                          5.4.0.40.43                           amd64        Generic Linux kernel image
+ii  linux-image-5.4.0-40-generic                 5.4.0-40.44                           amd64        Signed kernel image generic
+iF  linux-image-5.4.0-48-generic                 5.4.0-48.52                           amd64        Signed kernel image generic
+ii  linux-image-generic                          5.4.0.48.51                           amd64        Generic Linux kernel image
 # list of installed kernel packages:
-4.15.0-109-generic 4.15.0-109.110
 4.15.0-64-generic 4.15.0-64.73
 5.4.0-40-generic 5.4.0-40.44
+5.4.0-48-generic 5.4.0-48.52
 # list of different kernel versions:
+5.4.0-48.52
 5.4.0-40.44
-4.15.0-109.110
 4.15.0-64.73
-# Installing kernel: 5.4.0-40.44 (5.4.0-40-generic)
-# Running kernel: 4.15.0-64.73 (4.15.0-64-generic)
-# Last kernel: 5.4.0-40.44
-# Previous kernel: 4.15.0-109.110
+# Installing kernel: 5.4.0-48.52 (5.4.0-48-generic)
+# Running kernel: 5.4.0-40.44 (5.4.0-40-generic)
+# Last kernel: 5.4.0-48.52
+# Previous kernel: 5.4.0-40.44
 # Kernel versions list to keep:
-4.15.0-109.110
-4.15.0-64.73
 5.4.0-40.44
+5.4.0-48.52
 # Kernel packages (version part) to protect:
-4\.15\.0-109-generic
-4\.15\.0-64-generic
 5\.4\.0-40-generic
+5\.4\.0-48-generic
 */
diff --git a/apt/apt.conf.d/25loolwsd b/apt/apt.conf.d/25loolwsd
index d17ef9bb7fe373778d4c8cbda41cd65ef386a618..de34164e39d9d49c3213af7fc5e39067045c5d5b 100644 (file)
--- a/apt/apt.conf.d/25loolwsd
+++ b/apt/apt.conf.d/25loolwsd
@@ -1,2 +1,2 @@
 // Rebuild systemplate of Collabora Online Development Edition
-DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.2 >/dev/null 2>&1"; };
+DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.4 >/dev/null 2>&1"; };
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 a2a71171144728cdcb40f484224598164a6ce19b..1e1fe79a823d05659b211a2aae75a45ba0a53364 100644 (file)
--- a/loolwsd/loolkitconfig.xcu
+++ b/loolwsd/loolkitconfig.xcu
@@ -34,4 +34,10 @@
 <!-- Disable GIO UCP we don't want -->
 <item oor:path="/org.openoffice.ucb.Configuration/ContentProviders/Local/SecondaryKeys/Office/ProviderData/Provider999"><prop oor:name="URLTemplate" oor:op="fuse"><value>NeverMatchAnyUrlSuffix</value></prop></item>
 
+<!-- Default font for new documents. Most of the languages use 'en' settings. For those that do not, it's better not to touch their settings, because it's unlikely that Calibri (or Carlito) is better than current default. -->
+<item oor:path="/org.openoffice.VCL/DefaultFonts/org.openoffice.VCL:LocalizedDefaultFonts['en']"><prop oor:name="LATIN_HEADING" oor:op="fuse" oor:type="xs:string"><value>Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value></prop></item>
+<item oor:path="/org.openoffice.VCL/DefaultFonts/org.openoffice.VCL:LocalizedDefaultFonts['en']"><prop oor:name="LATIN_PRESENTATION" oor:op="fuse" oor:type="xs:string"><value>Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value></prop></item>
+<item oor:path="/org.openoffice.VCL/DefaultFonts/org.openoffice.VCL:LocalizedDefaultFonts['en']"><prop oor:name="LATIN_SPREADSHEET" oor:op="fuse" oor:type="xs:string"><value>Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value></prop></item>
+<item oor:path="/org.openoffice.VCL/DefaultFonts/org.openoffice.VCL:LocalizedDefaultFonts['en']"><prop oor:name="LATIN_TEXT" oor:op="fuse" oor:type="xs:string"><value>Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif</value></prop></item>
+
 </oor:items>
diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index fb27078909cbf9a74c233b15dc0d720f310f4aca..b0c274f1a582e5ec1858766beee9e21ca2e4208d 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAqP4O82iAyTciab/BlY1PCI0vV1oHfg81ZgwSYx/1r9hctLcdD4+3
-gTkuoco53WVjS7hr/7Btiop2V8tVYW5NnX08dUac1kCLJ1TO1n80UfnscuIvqkKN
-YlF8H/KN+DzJhrJxyysQlYNrUqblyPAQE5sYdpavBeUyWDG2kiOU4aXp2FJpVqvR
-t/zpJA70OO8+A34f7CyJnBq9EsDumN8WeoC5T5RprVwwp/KTUUmuV+c7T8vY8qRR
-CSMEvyIdK/escPgUSaIDu8OFIz9UONYmKCUXFgJxll61HMBrGLOc4iudgPZ9gmYV
-xsZuz+79a01Gyof9NRVdwf7C5YjEReweSwIBAg==
+MIIBCAKCAQEAq7/eQ6LXM7sXP25lA4p0lZTqA2clSLGjhbPfnKWING+qTnu3Y+Cv
+l4zKB5e/IpuVvyDLzHhgsgrixqPnLU64c98O2vk58HXNqLC7/fUJ0xXUty5aoV4/
+ZIVlAQT7aBTerBDJHt7msiuOWHxLdF6Ex8cNk//2xFx3RtrzyfeLYxeeisGfDlxX
+82N5AiLjVG8tlVR5l5k+1qmf6dcpIhKx59oJbSjUdUXHX93TaZtJtmQM3F5ykEsO
+KwQ4KCqZX4CVIEDT8jSWElzfZhJIRul6rQzmrj1eT0ib4btchweQMR38HXpnsCbf
+ZMz+Jkz2njE6NgG+WfRILhjb6JA/S/SdowIBAg==
 -----END DH PARAMETERS-----
etckeeper - vserver