saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index ee6a19add6e86895affe90ced445c6c0ee5c1abc..51027739a71514448fbe81bc7c1a204e25a8d7b3 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -3222,6 +3222,7 @@ maybe chmod 0644 'systemd/system/snap-core-9066.mount'
 maybe chmod 0644 'systemd/system/snap-core-9289.mount'
 maybe chmod 0644 'systemd/system/snap-core18-1754.mount'
 maybe chmod 0644 'systemd/system/snap-gnome\x2d3\x2d34\x2d1804-33.mount'
+maybe chmod 0644 'systemd/system/snap-gnome\x2d3\x2d34\x2d1804-36.mount'
 maybe chmod 0644 'systemd/system/snap-gtk\x2dcommon\x2dthemes-1506.mount'
 maybe chmod 0644 'systemd/system/snap-snap\x2dstore-454.mount'
 maybe chmod 0644 'systemd/system/snap.canonical-livepatch.canonical-livepatchd.service'
@@ -3239,7 +3240,7 @@ maybe chmod 0644 'systemd/user.conf'
 maybe chmod 0755 'systemd/user/default.target.wants'
 maybe chmod 0755 'systemd/user/sockets.target.wants'
 maybe chmod 0755 'teamviewer'
-maybe chmod 0644 'teamviewer/global.conf'
+maybe chmod 0600 'teamviewer/global.conf'
 maybe chmod 0600 'tenable_tag'
 maybe chmod 0755 'terminfo'
 maybe chmod 0644 'terminfo/README'

diff --git a/apt/trusted.gpg b/apt/trusted.gpg
index 729ad1ff637f0578fc37b15d2217592cf6cbee50..9850617a46bf25e5366bede5dbc71359afb1933e 100644 (file)
Binary files a/apt/trusted.gpg and b/apt/trusted.gpg differ

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index 613494111ccbf5adec8e79fcf206062a67b2ed45..abcaec69e5343c9ed4b4561723d8c23f82e817ad 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,7 +1,7 @@
 # Printer configuration file for CUPS v2.3.1
 # Written by cupsd
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-NextPrinterId 40
+NextPrinterId 42
 <Printer ar-hp-HP-LaserJet-M806>
 PrinterId 1
 UUID urn:uuid:e9b63086-a295-3d64-4799-24cf46be2061
@@ -97,27 +97,6 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
-<Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_>
-PrinterId 39
-UUID urn:uuid:9a13e2cb-8171-3fdd-4ae1-42e0e5565a54
-Info 
-Location 
-MakeModel HP Color LaserJet MFP M277dw, driverless, cups-filters 1.27.4
-DeviceURI implicitclass://HP_Color_LaserJet_MFP_M277dw_9D0E59_/
-State Idle
-StateTime 1591331313
-ConfigTime 1591331314
-Type 8425564
-Accepting Yes
-Shared No
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-Option cups-browsed true
-</Printer>
 <Printer HP_ENVY_4520_series_7B89BC_>
 PrinterId 6
 UUID urn:uuid:53fea9f7-eaf7-3997-43bb-7e9f0e78a2e9

diff --git a/systemd/system/multi-user.target.wants/snap-gnome\x2d3\x2d34\x2d1804-36.mount b/systemd/system/multi-user.target.wants/snap-gnome\x2d3\x2d34\x2d1804-36.mount
new file mode 120000 (symlink)
index 0000000..b6f9a68
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/snap-gnome\x2d3\x2d34\x2d1804-36.mount
@@ -0,0 +1 @@
+/etc/systemd/system/snap-gnome\x2d3\x2d34\x2d1804-36.mount
\ No newline at end of file

diff --git a/systemd/system/snap-gnome\x2d3\x2d34\x2d1804-36.mount b/systemd/system/snap-gnome\x2d3\x2d34\x2d1804-36.mount
new file mode 100644 (file)
index 0000000..5c9c8d8
--- /dev/null
+++ b/systemd/system/snap-gnome\x2d3\x2d34\x2d1804-36.mount
@@ -0,0 +1,13 @@
+[Unit]
+Description=Mount unit for gnome-3-34-1804, revision 36
+Before=snapd.service
+
+[Mount]
+What=/var/lib/snapd/snaps/gnome-3-34-1804_36.snap
+Where=/snap/gnome-3-34-1804/36
+Type=squashfs
+Options=nodev,ro,x-gdu.hide
+LazyUnmount=yes
+
+[Install]
+WantedBy=multi-user.target

diff --git a/systemd/system/teamviewerd.service b/systemd/system/teamviewerd.service
index be2e4716029fc93fc3a7b1fad26712eaf3bce615..caa52c01f07ff35cbe7ce8b884a402a4f85531ca 100644 (file)
--- a/systemd/system/teamviewerd.service
+++ b/systemd/system/teamviewerd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description = TeamViewer remote control daemon
-After = NetworkManager-wait-online.service network.target network-online.target dbus.service
-Wants = NetworkManager-wait-online.service network-online.target
+After = network.target network-online.target dbus.service
+Wants = network-online.target
 Requires = dbus.service
 
 [Service]

diff --git a/teamviewer/global.conf b/teamviewer/global.conf
index 89aee4cc30f38938215ba0136a9e34771771af48..2de646bcee856cda997b4a82f4bec5fa9b3667ce 100644 (file)
--- a/teamviewer/global.conf
+++ b/teamviewer/global.conf
@@ -2,12 +2,12 @@ TeamViewer Global Settings
 # It is not recommended to edit this file manually
 
 
-[bin  ] Certificate = 120901100000008b3e08a7979a4708aef402ea1876ca80021101000008000901010001000800000101000000c77194e84b81af0e678e0a58b1f07e184b488f80d162dc918726f2c87faea28fd6efc622cafade6f7589b1b6dc64978e1cba2a2e38d04e7512df830856a96b9f6a6254af19e6c458f8597119ae6604e79c2c0966ef4dddfd6b6f5af69edaa8c75d648095f1d39558debc8beb0ed31f6eb639b52ada687066262daadcec3a14a71dc717e6797e20ddb74d38db79a08cdcd751492f56556c0aedb7a01b5e6ab0d8400aeab10858dcced482dd9c01ca63a1e55cf6a114c609831684dae697edd3e117e5d74d34fda8411e1255c9306fe0702d6cf542242b166d5bcc51fd6d23e5cf13fda110a47eb1afd73ccd1cc15f4f4450544d73785fbddbe1175240bd965d61110304000000020000000404000000dc4eb32a081000000039ccd6c13c0542debf3818f1d12081e309070000000102030408090b0a000100006bb9c81e308dc0853321128f5c4ed246234bab51c0c32ed56cab57c12ec5adf989988dfb8c9d0b13fa4c6f9cb309fa27cf13c20965502856b65320b3cf8c9d51807ec033fe8fde4c1910bc34cd29cf25a021ba62f26fd1be046e03fbea600040be73bc18f29663081ba262345ab6741f06adbe6c2cb4ac3c77b87a3497e65fb5b47ddb5df3ae5d1413bfb5884224cf4c4e70e8cf2e14d223c73a085f2f78092668b1ad6c081e4dbd6db09d54f4bda399d197e9e799a50ec584cfae04aeb4acdf972d174a1abcd0c60ddf7c5e9cf2fa7a8dea0bbf39d4a14cc3acb832f9144104c5c247265a0b86f113655073ca631f850bc91aae2e8b5409a44f3c888a352ad90b0100000000fe010000000f
-[bin  ] CertificateKey = 4e1413ca8b66200304e2a2bd667456f2c1357c15ab5ecbf9cbf8164dc2250c77624de6b9484f8e49e88a61103b0b3ee782b8c8ca7f56108b8f0a14accee879dca27dc6f831f89c0d93994e0ef90fd11d1986fb5465c5ddf46e27e2162f4a77e9a584bfed2f10d0f00b562bbeb4ca2daccc196027e25651d41681c39d2af6f65720b39b5d88e19c8689123376ba5b0b20da4b323d85a405dad0ab10a03026ca2b4effabda07a0597a00f990ca41f216bcd7d5d70e80ef97c4e5f99ea994ceaf0b5cab32826bd2821a24a4fab9e3f623936710624131bff1a4e0ab7b2553f3d98ca7c38148693da3e4c2fbcb6819268576343669e339386191c91e3425ec14af09a445d85d3497de13a2eacd4f1a85ef0a23cb58b796d4d7bdb4a443b08dd1c6938c48bcada95eca6f979f004098e3119c75f28db23d7a47061b3f22ead62d4356a5cddb77ee984b575a55eda5c8af7b9d8008a452f219bd57d58a4a053dffe2c5cd9b4b62598a0952e7571502d9c27e7d93065cd39cf2e3b44a3564f3f4b4322b116be61bd7ecf12c96c38ab4b50ec1be67c9ca2eb8182fcb197a7fb032920e27cef1186a327e316286e81831c5b4fed9d3e252a8486447892c6ad6681dd209d3124045fefe735190505fca08f3e8e8a074417e840118a0c8d434fc94fe916353acb7e67607fbae53a390a0eb18509d792f1e51fe1729e5f91b2e89d7ffb6dd0e4dc99a58f75da6124e17e53a38951dfafa97e9a77f76037425f9aad49e07735e026a64187c366128e20f55ee243667f2
+[bin  ] Certificate = 120901100000003d65e0c596514e10bc5d288e80638223021101000008000901010001000800000101000000ddd15b5586602f3bd0e322e23fa89bddb9cb2d17bf82c97000971d6cf29790f5e16190189707ef6deb04802d8957f51586bf487d55cebb87db413296af97c4cf92e6ce4cca2ba8d63d7db4e4847c28786f90d8990f12699e81f53b77d87ac5e31079ee6dd02942c25c1aa42e42699ce2582e5cf27d4b65e7699a8cdbc48dea00e07ef4936e1d477092576e8cb723b3414a7272c18931993e3d9c6ccff7e3ad5730c4cd43ac1f5047b7c60087af10a0f11260be73c90c5780f0e9672c12920c76efe71a398ae26ec25712c5c8e48e1e66a057ba754829313af5e582c41805dcba3440330acb049807e696abae1cb936c48f3ab1210397a58e0849f34107771867110304000000020000000404000000dc4eb32a081000000039ccd6c13c0542debf3818f1d12081e309070000000102030408090b0a0001000033594931ea9a47bd79a0015bb56f0f680eb19bad533c05425cf9337144585b3b44ba9b9adce448f44c4892191e40d87cc80ec6174a73d78885c34c4bd459b19b57b04fd2913e296ac90198b2c7b19fbcf6608038b2b04b1d0838edae32af10e0f343279beecb4ed316048214df0ebab592c6154207f95b300d10aadca19e4d41709246a4482734304bf34cf961efed23f722886d73d3f5f2bbf1ae68adeebe93d1a9f1c0f445df7d87146780c332bc5e5f69d5cc539f2ff78c8272f7b7e2e3fcc9d3cffd10463997a1aa5db4542b10aec259665c7a407bcd2f2afdd904a2e962529baf1ea5f2de9f7d5fd7137ba114474a5302f36f964c47d3daecc289ad511a0b0100000001fe010000000f
+[bin  ] CertificateKey = def54d6fd5270e47d6d90f565ee8738febc7cf6f52a1733483f0e2d527af03bf119521ce463cc0a531b56a63a4c56421b6afd182adbcc9e96afa858bc0a0e000d2d142f6eb66ebee513d182357d1579c1bdad85cd42aa939ec63d8bfafe4d62ab92c9ee7b0b635468797de77b3e82672d6120a4f33a9e749df786afd530268749bcbc75a7e702dbb804e9c5c67e5eaec2cbc4260cc599edbd7285106c1e5840a546a9a23caa929bafd27af2107a76aa8ef7ff95fae278caae096e8ee990a1734f7dac101ffab8e2be7210d3fb5a7dd9cd40bc8fc8da1ac1088f5ce70d8840822a18d766dc6bd86b90dc3f95800742f3b7134f8b81ad0ae24d260ec8d6f69395f6f1b40f8963661e7acdc8f15da93ca59c048135156957d87ffb78a6b998334d591be559e7de39d206f2c7bb45131dc6fe612f6ebd049d5e2f3347b6077523d4b702457d337d1abf6b270cfeb53bea6828fb4335e918c7e75ffa09ead95059246b0a3a7c34c746d0eaedafd2161b18776a7679290a1a22d5594a7f26a3712bad44896fd36243560d313e3b46190a0f38c84a705a07950558e8cd27aa35a5066be2a085dbeff2bcc587f0fa09982aec90d81ddf6472940ee3e8a048e4d2c82c1b496abceef2fad7437c562b0987efc1609f5f3a4223192cf7da4ffee1b7c73341f1b3f5f0ca60633e5f8fbacec8c748d8440c6426e339c0338e0d63a38871e14e48b83fa2475103cc2b08f3468b76e26d0d0862c07aed661fb533e438225a26396e6fe4cf53d9632ee154b68011e38dcfa
 [int32] ClientIC = -1148625145
 [int32] ClientID = 716394204
-[bin  ] ConnectionHistory = a08676894e71495f8193b359d78d787a
-[bin  ] EnterpriseUIState = 1fc74708a94ad3a3809a0a5f677980ca0ba40ea0d19d17070ee1b4bc16353109
+[bin  ] ConnectionHistory = c9751647e248042cc38d269ccba21703854e272acd12bdf492078512e5b7c982
+[bin  ] EnterpriseUIState = feb81a03bcfef47818c54e2c7ccba0e6a77a5da4b4defc7069a4443f5025ef45
 [int32] EulaAccepted = 1
 [int32] Had_a_commercial_Connection = 1
 [int32] IPC_Port_Service = 5941
@@ -18,4 +18,4 @@ TeamViewer Global Settings
 [bin  ] PK = dc5641dcd04e9cd404982e9177002743a5c27b8b39636d56e6544f76061760dadad5227c7798c2e46a0599de6daf91d9da694796488d37b98703624538b74cfe0a080b5b2398fd060fabce96f30cf90fb93e1a65883ae78d72382d62916116116a6333c9dbba14f264e54d50f887f3ab554b41cd4b74f254531d5feb936a3f96d0fce25d27e2471f29aef9b52b87644d47b12df8e33c4aad1e95c8b41fb63781d8373b6a147145a173d3646ef888ee9f2ffb51e22a90afd2e547cd44fab80959e7cb7af12a9f994069c60cb39b23310320b37009ab2df1b33dce16946971755f9ada0e78a68882c9d767b1169ab9586452ea7b1287559517075052b487ca2b0a0a1777e800def7f97d0ed552d543d5b8a69021c2731583e800f713fc827034fcb9c5119a0bf785775475fe77c079b4aa0539d87f449556fbffe5e3cd16521ef0af5205b806e51f928062121752b024471ef7ee5ee9e828585bf7f2c982111ca6508c159b51bae4af7a574d0a763078e0a278b777cbc61bb17ac1bcfc6744e9153fea69bbb917cd7ee32ca349cb068f96fcbf5d17509e77f8b925be79e6d9bbe2116211e9edafe123e2f7921891519222eadd6c866deaa9ed200183c9e2c52185330b3a3d0a43b3dbede24d6d36a9de8878f457d9396662a53ff21c64a62297b99980fa1c8b2d360037546abc2449a19411406b8d5ab9b0e634aa2e124b7d996d79ee42caad221da70bdae5ce7fcaf4159ee393703f6ac831f50a60af1fe46179c2c6cb51301b2e947a7fd8fb31e6f7294ad4e3e5aae88b9358ce160da9f95189b23d385c051428552dfb2681dbf3ab2943b04a21b949b8b163b4bc6cacdb5c309b28907e671559d3d8b6305b784d829dca5b050ebb4333ef09b5e5475c71e7d2
 [bin  ] SK = dc5641dcd04e9cd404982e9177002743a5c27b8b39636d56e6544f76061760dac23de5710782c706e1766f98e619d4956ec4ecfcd49c940d1d79e8c1739446312c0bbdfcac0aac5560cc809780b963a1134d209cb9e8843961f8951e97955f1dae30b15a42621daa619deafead896bf9082d7bc0f790f7d7dc2aeccceacda7cde3ff5c851348e565927f4967f02469623724e037f03626d7b5e907317f9ea60ee2f2ea08a8cb9287e0210121d53cd2faed19aec2c85e613683af2ddbd01ce47559af9a1bc2b7ed122982a818c1845f122f2bdac8e9c2ed8dc9a9a5384ec641c39d85012d4bdc62d0848fa5f1956e46596058af165be3be3d3c1dc5be02380aad7c7ffd4b48ee6f9a7399ad05517884315bfd48b076a8eac73bd8e90b4b76f267ac1d3a94eb0821cc3d0bb23766e2f0974df5232d340cea565797a2b9b2d27494991f955e30ed2e5c26ff7507957f2c8d6be113d34270555453dcba58942e6d6e89550e990b9f4ec4327e9fc6325ed9ea01e77c2df60381582b4c51d896d99e10c1ffdcb6e5c14c1854f164c5c017f89584617ae6fdb3a146582d281903e0d8c07f3db0fb00acf47fa69a8b6fe3581644533b04970457a04d19ce22efb74d6fef395b1fcc3cfd11e14f0690d5c49552fd1a3b8a69b74618a451426e688acdc19505de4add131bbd4d290d5d61c2ab9dbfa59c509679bfa8d6f569b3c7f136f7582eabb467ccb5094d141bfc49fdbe1eb99f63bd41d7f8e99fd3195cb2d851d7e9ef976922abf8665fec03b803c22d159a74f9965ae3efef4d556ecb6fe112fd8af2f8777b48eab4ded1a8370b64d532a397c8166cad26c126d3d4e6802367bd874bde66c8573f631b9680922f8495b9a8c221407a01b0e572cbbafc4a9564ec05
 [bin  ] SRPPasswordMachineIdentifier = 2331d140c7670af7230122a130323e7b0a4dc9af0d6179e2b247bad4eb1a272d30f7344d56e2a1aad0159a6eb0369ef70146854bf3a3b9d9da302aa3fb519f88c64cd7a190541e91a4d432ea891ca731b1e2cbc060bfbe624da88e3368aaf0fffd7ea4b8e3a8f5414047fa3ee2f6ed9d
-[strng] Version = "14.4.2669 "
+[strng] Version = "15.6.7 "