From 1b4626c0a487691873f07a1ff0acd1076ced58b6 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Wed, 12 Dec 2018 10:49:40 +0100 Subject: [PATCH] committing changes in /etc after apt run Package changes: -adobe-flashplugin 1:20181120.1-0ubuntu0.18.04.1 amd64 +adobe-flashplugin 1:20181205.1-0ubuntu0.18.04.1 amd64 -chromium-codecs-ffmpeg-extra 70.0.3538.77-0ubuntu0.18.04.1 amd64 +chromium-codecs-ffmpeg-extra 71.0.3578.80-0ubuntu0.18.04.1 amd64 -collaboraoffice5.3 5.3.10.60-60 amd64 -collaboraoffice5.3-ure 5.3.10.60-60 amd64 -collaboraofficebasis5.3-calc 5.3.10.60-60 amd64 -collaboraofficebasis5.3-core 5.3.10.60-60 amd64 -collaboraofficebasis5.3-draw 5.3.10.60-60 amd64 -collaboraofficebasis5.3-en-us 5.3.10.60-60 amd64 -collaboraofficebasis5.3-en-us-calc 5.3.10.60-60 amd64 -collaboraofficebasis5.3-en-us-res 5.3.10.60-60 amd64 -collaboraofficebasis5.3-extension-pdf-import 5.3.10.60-60 amd64 -collaboraofficebasis5.3-filter-data 5.3.10.60-60 amd64 -collaboraofficebasis5.3-graphicfilter 5.3.10.60-60 amd64 -collaboraofficebasis5.3-images 5.3.10.60-60 amd64 -collaboraofficebasis5.3-impress 5.3.10.60-60 amd64 -collaboraofficebasis5.3-noto-fonts 5.3.10.60-60 amd64 -collaboraofficebasis5.3-ooofonts 5.3.10.60-60 amd64 -collaboraofficebasis5.3-ooolinguistic 5.3.10.60-60 amd64 -collaboraofficebasis5.3-writer 5.3.10.60-60 amd64 +collaboraoffice5.3 5.3.10.61-61 amd64 +collaboraoffice5.3-ure 5.3.10.61-61 amd64 +collaboraofficebasis5.3-calc 5.3.10.61-61 amd64 +collaboraofficebasis5.3-core 5.3.10.61-61 amd64 +collaboraofficebasis5.3-draw 5.3.10.61-61 amd64 +collaboraofficebasis5.3-en-us 5.3.10.61-61 amd64 +collaboraofficebasis5.3-en-us-calc 5.3.10.61-61 amd64 +collaboraofficebasis5.3-en-us-res 5.3.10.61-61 amd64 +collaboraofficebasis5.3-extension-pdf-import 5.3.10.61-61 amd64 +collaboraofficebasis5.3-filter-data 5.3.10.61-61 amd64 +collaboraofficebasis5.3-graphicfilter 5.3.10.61-61 amd64 +collaboraofficebasis5.3-images 5.3.10.61-61 amd64 +collaboraofficebasis5.3-impress 5.3.10.61-61 amd64 +collaboraofficebasis5.3-noto-fonts 5.3.10.61-61 amd64 +collaboraofficebasis5.3-ooofonts 5.3.10.61-61 amd64 +collaboraofficebasis5.3-ooolinguistic 5.3.10.61-61 amd64 +collaboraofficebasis5.3-writer 5.3.10.61-61 amd64 -cups 2.2.7-1ubuntu2.1 amd64 +cups 2.2.7-1ubuntu2.2 amd64 -cups-bsd 2.2.7-1ubuntu2.1 amd64 -cups-client 2.2.7-1ubuntu2.1 amd64 -cups-common 2.2.7-1ubuntu2.1 all -cups-core-drivers 2.2.7-1ubuntu2.1 amd64 -cups-daemon 2.2.7-1ubuntu2.1 amd64 +cups-bsd 2.2.7-1ubuntu2.2 amd64 +cups-client 2.2.7-1ubuntu2.2 amd64 +cups-common 2.2.7-1ubuntu2.2 all +cups-core-drivers 2.2.7-1ubuntu2.2 amd64 +cups-daemon 2.2.7-1ubuntu2.2 amd64 -cups-ipp-utils 2.2.7-1ubuntu2.1 amd64 +cups-ipp-utils 2.2.7-1ubuntu2.2 amd64 -cups-ppdc 2.2.7-1ubuntu2.1 amd64 -cups-server-common 2.2.7-1ubuntu2.1 all +cups-ppdc 2.2.7-1ubuntu2.2 amd64 +cups-server-common 2.2.7-1ubuntu2.2 all -desktop-file-utils 0.23+linuxmint3 amd64 +desktop-file-utils 0.23+linuxmint4 amd64 -ghostscript 9.25~dfsg+1-0ubuntu0.18.04.2 amd64 -ghostscript-x 9.25~dfsg+1-0ubuntu0.18.04.2 amd64 +ghostscript 9.26~dfsg+0-0ubuntu0.18.04.3 amd64 +ghostscript-x 9.26~dfsg+0-0ubuntu0.18.04.3 amd64 -gir1.2-gkbd-3.0 3.26.0-3 amd64 +gir1.2-gkbd-3.0 3.26.0-3ubuntu0.18.04.1 amd64 -gir1.2-gnomedesktop-3.0 3.28.2-0ubuntu1 amd64 +gir1.2-gnomedesktop-3.0 3.28.2-0ubuntu1.1 amd64 -git 1:2.17.1-1ubuntu0.3 amd64 -git-man 1:2.17.1-1ubuntu0.3 all -gitweb 1:2.17.1-1ubuntu0.3 all -gkbd-capplet 3.26.0-3 amd64 +git 1:2.17.1-1ubuntu0.4 amd64 +git-man 1:2.17.1-1ubuntu0.4 all +gitweb 1:2.17.1-1ubuntu0.4 all +gkbd-capplet 3.26.0-3ubuntu0.18.04.1 amd64 -gnome-desktop3-data 3.28.2-0ubuntu1 all +gnome-desktop3-data 3.28.2-0ubuntu1.1 all -hwdata 0.290-1 all +hwdata 0.290-1ubuntu0.18.04.1 all -libcups2 2.2.7-1ubuntu2.1 amd64 -libcups2 2.2.7-1ubuntu2.1 i386 -libcupscgi1 2.2.7-1ubuntu2.1 amd64 +libcups2 2.2.7-1ubuntu2.2 amd64 +libcups2 2.2.7-1ubuntu2.2 i386 +libcupscgi1 2.2.7-1ubuntu2.2 amd64 -libcupsimage2 2.2.7-1ubuntu2.1 amd64 -libcupsimage2 2.2.7-1ubuntu2.1 i386 -libcupsmime1 2.2.7-1ubuntu2.1 amd64 -libcupsppdc1 2.2.7-1ubuntu2.1 amd64 +libcupsimage2 2.2.7-1ubuntu2.2 amd64 +libcupsimage2 2.2.7-1ubuntu2.2 i386 +libcupsmime1 2.2.7-1ubuntu2.2 amd64 +libcupsppdc1 2.2.7-1ubuntu2.2 amd64 -libgnomekbd-common 3.26.0-3 all -libgnomekbd8 3.26.0-3 amd64 +libgnomekbd-common 3.26.0-3ubuntu0.18.04.1 all +libgnomekbd8 3.26.0-3ubuntu0.18.04.1 amd64 -libgs9 9.25~dfsg+1-0ubuntu0.18.04.2 amd64 -libgs9-common 9.25~dfsg+1-0ubuntu0.18.04.2 all +libgs9 9.26~dfsg+0-0ubuntu0.18.04.3 amd64 +libgs9-common 9.26~dfsg+0-0ubuntu0.18.04.3 all -libjavascriptcoregtk-4.0-18 2.22.2-0ubuntu0.18.04.2 amd64 +libjavascriptcoregtk-4.0-18 2.22.4-0ubuntu0.18.04.1 amd64 -libperl5.26 5.26.1-6ubuntu0.2 amd64 +libperl5.26 5.26.1-6ubuntu0.3 amd64 -libpoppler-glib8 0.62.0-2ubuntu2.2 amd64 +libpoppler-glib8 0.62.0-2ubuntu2.5 amd64 -libpoppler73 0.62.0-2ubuntu2.2 amd64 +libpoppler73 0.62.0-2ubuntu2.5 amd64 -libraw16 0.18.8-1ubuntu0.1 amd64 +libraw16 0.18.8-1ubuntu0.2 amd64 -libsmbclient 2:4.7.6+dfsg~ubuntu-0ubuntu2.4 amd64 +libsmbclient 2:4.7.6+dfsg~ubuntu-0ubuntu2.5 amd64 -libssh-4 0.8.0~20170825.94fa1e38-1ubuntu0.1 amd64 -libssh-gcrypt-4 0.8.0~20170825.94fa1e38-1ubuntu0.1 amd64 +libssh-4 0.8.0~20170825.94fa1e38-1ubuntu0.2 amd64 +libssh-gcrypt-4 0.8.0~20170825.94fa1e38-1ubuntu0.2 amd64 -libssl1.0.0 1.0.2n-1ubuntu5.1 amd64 -libssl1.0.0 1.0.2n-1ubuntu5.1 i386 +libssl1.0.0 1.0.2n-1ubuntu5.2 amd64 +libssl1.0.0 1.0.2n-1ubuntu5.2 i386 -libwavpack1 5.1.0-2ubuntu1.1 amd64 -libwavpack1 5.1.0-2ubuntu1.1 i386 +libwavpack1 5.1.0-2ubuntu1.2 amd64 +libwavpack1 5.1.0-2ubuntu1.2 i386 -libwbclient0 2:4.7.6+dfsg~ubuntu-0ubuntu2.4 amd64 -libwebkit2gtk-4.0-37 2.22.2-0ubuntu0.18.04.2 amd64 +libwbclient0 2:4.7.6+dfsg~ubuntu-0ubuntu2.5 amd64 +libwebkit2gtk-4.0-37 2.22.4-0ubuntu0.18.04.1 amd64 -linux-libc-dev 4.15.0-39.42 amd64 +linux-libc-dev 4.15.0-42.45 amd64 -loolwsd 3.4.1-1 amd64 +loolwsd 3.4.2-1 amd64 -mint-mirrors 1.1.8 all +mint-mirrors 1.1.9 all -mintbackup 2.3.4 all +mintbackup 2.3.5 all -nplan 0.36.3 all +nplan 0.40.1~18.04.3 all -openjdk-8-jre 8u181-b13-1ubuntu0.18.04.1 amd64 -openjdk-8-jre-headless 8u181-b13-1ubuntu0.18.04.1 amd64 +openjdk-8-jre 8u191-b12-0ubuntu0.18.04.1 amd64 +openjdk-8-jre-headless 8u191-b12-0ubuntu0.18.04.1 amd64 -perl 5.26.1-6ubuntu0.2 amd64 -perl-base 5.26.1-6ubuntu0.2 amd64 +perl 5.26.1-6ubuntu0.3 amd64 +perl-base 5.26.1-6ubuntu0.3 amd64 -perl-modules-5.26 5.26.1-6ubuntu0.2 all +perl-modules-5.26 5.26.1-6ubuntu0.3 all -poppler-utils 0.62.0-2ubuntu2.2 amd64 +poppler-utils 0.62.0-2ubuntu2.5 amd64 -python-lxml 4.2.1-1 amd64 +python-lxml 4.2.1-1ubuntu0.1 amd64 -python-samba 2:4.7.6+dfsg~ubuntu-0ubuntu2.4 amd64 +python-samba 2:4.7.6+dfsg~ubuntu-0ubuntu2.5 amd64 -python3-lxml 4.2.1-1 amd64 +python3-lxml 4.2.1-1ubuntu0.1 amd64 -python3-update-manager 1:18.04.11.7 all +python3-update-manager 1:18.04.11.8 all -redis-server 5:4.0.9-1 amd64 -redis-tools 5:4.0.9-1 amd64 +redis-server 5:4.0.9-1ubuntu0.1 amd64 +redis-tools 5:4.0.9-1ubuntu0.1 amd64 -samba 2:4.7.6+dfsg~ubuntu-0ubuntu2.4 amd64 -samba-common 2:4.7.6+dfsg~ubuntu-0ubuntu2.4 all -samba-common-bin 2:4.7.6+dfsg~ubuntu-0ubuntu2.4 amd64 -samba-dsdb-modules 2:4.7.6+dfsg~ubuntu-0ubuntu2.4 amd64 -samba-libs 2:4.7.6+dfsg~ubuntu-0ubuntu2.4 amd64 -samba-vfs-modules 2:4.7.6+dfsg~ubuntu-0ubuntu2.4 amd64 +samba 2:4.7.6+dfsg~ubuntu-0ubuntu2.5 amd64 +samba-common 2:4.7.6+dfsg~ubuntu-0ubuntu2.5 all +samba-common-bin 2:4.7.6+dfsg~ubuntu-0ubuntu2.5 amd64 +samba-dsdb-modules 2:4.7.6+dfsg~ubuntu-0ubuntu2.5 amd64 +samba-libs 2:4.7.6+dfsg~ubuntu-0ubuntu2.5 amd64 +samba-vfs-modules 2:4.7.6+dfsg~ubuntu-0ubuntu2.5 amd64 -ubuntu-keyring 2018.02.28 all +ubuntu-keyring 2018.09.18.1~18.04.0 all -unattended-upgrades 1.1ubuntu1.18.04.6 all +unattended-upgrades 1.1ubuntu1.18.04.7 all -update-manager-core 1:18.04.11.7 all -update-notifier-common 3.192.1.3 all +update-manager-core 1:18.04.11.8 all +update-notifier-common 3.192.1.4 all -usbmuxd 1.1.0-2build1 amd64 +usbmuxd 1.1.0-2ubuntu0.1 amd64 --- .etckeeper | 1 + apache2/conf-available/loolwsd.conf | 4 ++++ .../ubuntu-keyring-2018-archive.gpg | Bin 0 -> 1733 bytes chromium-browser/customizations/10-flash | 2 +- cups/printers.conf | 6 +++--- java-8-openjdk/security/java.security | 4 ++-- nginx/snippets/loolwsd.conf | 6 ++++++ 7 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg diff --git a/.etckeeper b/.etckeeper index acad1e05..b55eda9b 100755 --- a/.etckeeper +++ b/.etckeeper @@ -763,6 +763,7 @@ maybe chmod 0644 'apt/trusted.gpg' maybe chmod 0755 'apt/trusted.gpg.d' maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg' maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg' +maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg' maybe chmod 0755 'arpwatch' maybe chmod 0644 'arpwatch/README' maybe chown 'asterisk' 'asterisk' diff --git a/apache2/conf-available/loolwsd.conf b/apache2/conf-available/loolwsd.conf index 10b66b47..7ccfe005 100644 --- a/apache2/conf-available/loolwsd.conf +++ b/apache2/conf-available/loolwsd.conf @@ -20,6 +20,10 @@ ProxyPass /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0 ProxyPassReverse /hosting/discovery http://127.0.0.1:9980/hosting/discovery + # Capabilities + ProxyPass /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0 + ProxyPassReverse /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities + # Main websocket ProxyPassMatch "/lool/(.*)/ws$" ws://127.0.0.1:9980/lool/$1/ws nocanon diff --git a/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg b/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg new file mode 100644 index 0000000000000000000000000000000000000000..1cc9f3f2df5734dc3ea7c33be841594b0fcf38ef GIT binary patch literal 1733 zcmV;$20Hnf0u2OPpTXJz5CHG|Y;w0B%W);xxXlc}sv~S1p7UEY8(GB1>2v8&6r_b2 zow+J?a7PR0aI9p%3FnKr2+u^dJOYeF{y6VtT71M&gjjYRl3JG;pWr3)`FD57P#akt zkqMW;e4E-#9sj^V2W$)GGmA8a=H5((dM(3FI4yf!5J@rG-igmchOQsEB8+NZx><^@ zg1=uuq85~jf{b>a#7m@DeBS7nq0%f_YcYFOejnnFlYNhNVN_*aL@y*LbSx*6DT61~%E@&ofbZy+x?f(pE~+{Q2ww49tXWK@M$|IU#!D zH=8MU-xi}eEp$*#>XRFTza%~*q@+U92I){2 z+K8NszUQgOc^0Cg_psdyhEoXhPoD#^lfHwo;@WCfT;&s_+Kr38jrF%elZ8u{un@;f z+o*HK#$f&jnY}i^t;7C0!b(PHZ{kB}=nS36bU)pde}8rTnLYnV^4le=rjiPGV>f!Y zlimjJnLXk}K*lU3*>@*7cA-3)_{@~)rU0U)k6VU= zbl3^B7L8-xGH_32xdnnoXk4EE=pcJ-WMQ{k2hN*yEjE5hfbcs4dhrBl>@-?tUs&k~ zlx^#wt6@~B9Z;Ed2st7YUK-pm2vHPc90<9cCZO$dWh*5&YczFt}A;(3M6yXu9Rv+;+i#0wj8H4exLhg` za1TcMoAXoF6wxU%vn~ zE{zNOgnvILFIxoyTc5;30162Z3;TqBKPN9+ZWj;z8U~(%3&NjXP^M4;YtD{E;y_0k zz{Zw~+imGCNC0dW069L-nKdd8Fcn8IeZnUgse+W+ruwndUc(BT;mBFp>BqR1h&; zuSW&(LZvV-O)4~Xmi*P5Ya){1dJvL3^apcSIwG~ z_}F5$?D>^PxU>j?->Sp&dd~vwR5&Qu_c|4JX{uzSMH#IH5^lfcXABpBI?H9z31~)c zU_=^!!V7)eO+bg_2}N6sKw7iXbJ~Wdr@vPG#H=~Tw??DvM>lcP!^gCk0VlxesyPF zdlTfA3~X(K2(ifg;xC?*YV!Yi<_THkzgnxt&7AB4*b=%iRV<~lQKVwf+t^!pe -UUID urn:uuid:8660d1e8-c0e2-31e6-533e-20e8f2b4f883 +UUID urn:uuid:7b0aa7bf-b984-39e9-722c-6b689f5387e2 Info Location MakeModel HP Color LaserJet MFP M277dw, driverless, cups-filters 1.20.2 DeviceURI ipps://NPI9D0E59.local:443/ipp/print State Idle -StateTime 1544569812 -ConfigTime 1544569812 +StateTime 1544608051 +ConfigTime 1544608051 Type 8425564 Accepting Yes Shared No diff --git a/java-8-openjdk/security/java.security b/java-8-openjdk/security/java.security index 1e62d676..8ca02883 100644 --- a/java-8-openjdk/security/java.security +++ b/java-8-openjdk/security/java.security @@ -620,8 +620,8 @@ jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, DSA keySize < 1024 # # Example: # jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048 -jdk.tls.disabledAlgorithms=SSLv3, RC4, MD5withRSA, DH keySize < 1024, \ - EC keySize < 224, DES40_CBC, RC4_40, 3DES_EDE_CBC +jdk.tls.disabledAlgorithms=SSLv3, RC4, DES, MD5withRSA, DH keySize < 1024, \ + EC keySize < 224, 3DES_EDE_CBC # Legacy algorithms for Secure Socket Layer/Transport Layer Security (SSL/TLS) # processing in JSSE implementation. diff --git a/nginx/snippets/loolwsd.conf b/nginx/snippets/loolwsd.conf index f55f8829..e176760b 100644 --- a/nginx/snippets/loolwsd.conf +++ b/nginx/snippets/loolwsd.conf @@ -10,6 +10,12 @@ proxy_set_header Host $http_host; } + # Capabilities + location ^~ /hosting/capabilities { + proxy_pass http://localhost:9980; + proxy_set_header Host $http_host; + } + # main websocket location ~ ^/lool/(.*)/ws$ { proxy_pass http://localhost:9980; -- 2.43.0