committing changes in /etc made by "/usr/bin/apt full-upgrade -y"

author Frank Brehm <frank@brehm-online.com>

Tue, 16 Aug 2022 07:14:00 +0000 (09:14 +0200)

committer Frank Brehm <root@bruni.home.brehm-online.com>

Tue, 16 Aug 2022 07:14:00 +0000 (09:14 +0200)
author Frank Brehm <frank@brehm-online.com>
Tue, 16 Aug 2022 07:14:00 +0000 (09:14 +0200)
committer Frank Brehm <root@bruni.home.brehm-online.com>
Tue, 16 Aug 2022 07:14:00 +0000 (09:14 +0200)
diff --git a/.etckeeper b/.etckeeper

index 0221a837837dfd493b547da997b09c8ea4fd4a57..5ef396109a70f1430f114312fb3482e6caaa4ce6 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -10,6 +10,7 @@ mkdir -p './X11/xkb'
  mkdir -p './apm/event.d'
  mkdir -p './apparmor.d/force-complain'
  mkdir -p './apt/auth.conf.d'
+mkdir -p './apt/keyrings'
  mkdir -p './avahi/services'
  mkdir -p './binfmt.d'
  mkdir -p './brltty/Input/xw'
@@ -19,6 +20,7 @@ mkdir -p './cups/interfaces'
  mkdir -p './cups/ssl'
  mkdir -p './dbus-1/session.d'
  mkdir -p './dconf/db'
+mkdir -p './gdb/gdbinit.d'
  mkdir -p './glvnd/egl_vendor.d'
  mkdir -p './gss/mech.d'
  mkdir -p './guest-session'
@@ -34,11 +36,13 @@ mkdir -p './initramfs-tools/scripts/nfs-bottom'
  mkdir -p './initramfs-tools/scripts/nfs-premount'
  mkdir -p './initramfs-tools/scripts/nfs-top'
  mkdir -p './initramfs-tools/scripts/panic'
-mkdir -p './kernel/install.d'
+mkdir -p './keyutils'
  mkdir -p './libpaper.d'
+mkdir -p './libreoffice/registry/res'
  mkdir -p './libvirt/hooks'
  mkdir -p './libvirt/secrets'
  mkdir -p './mate-settings-daemon/xrandr'
+mkdir -p './mdevctl.d'
  mkdir -p './molly-guard/messages.d'
  mkdir -p './mono/registry/LocalMachine'
  mkdir -p './network/interfaces.d'
@@ -48,6 +52,7 @@ mkdir -p './networkd-dispatcher/dormant.d'
  mkdir -p './networkd-dispatcher/no-carrier.d'
  mkdir -p './networkd-dispatcher/off.d'
  mkdir -p './networkd-dispatcher/routable.d'
+mkdir -p './nfs.conf.d'
  mkdir -p './openvpn/client'
  mkdir -p './openvpn/server'
  mkdir -p './opt'
@@ -61,9 +66,11 @@ mkdir -p './polkit-1/localauthority/90-mandatory.d'
  mkdir -p './postfix/dynamicmaps.cf.d'
  mkdir -p './postfix/sasl'
  mkdir -p './powerline'
+mkdir -p './ppp/ip-pre-up.d'
  mkdir -p './ppp/ipv6-down.d'
  mkdir -p './ppp/ipv6-up.d'
  mkdir -p './ppp/resolv'
+mkdir -p './pulse/default.pa.d'
  mkdir -p './samba/tls'
  mkdir -p './security/limits.d'
  mkdir -p './security/namespace.d'
@@ -112,7 +119,6 @@ maybe chmod 0644 'NetworkManager/conf.d/90-dns-none.conf'
  maybe chmod 0644 'NetworkManager/conf.d/default-wifi-powersave-on.conf'
  maybe chmod 0755 'NetworkManager/dispatcher.d'
  maybe chmod 0755 'NetworkManager/dispatcher.d/01-ifupdown'
-maybe chmod 0755 'NetworkManager/dispatcher.d/20-chrony'
  maybe chmod 0755 'NetworkManager/dispatcher.d/no-wait.d'
  maybe chmod 0755 'NetworkManager/dispatcher.d/pre-down.d'
  maybe chmod 0755 'NetworkManager/dispatcher.d/pre-up.d'
@@ -150,7 +156,6 @@ maybe chmod 0644 'X11/Xsession.d/55mate-session_materc'
  maybe chmod 0644 'X11/Xsession.d/55numlockx'
  maybe chmod 0644 'X11/Xsession.d/60x11-common_localhost'
  maybe chmod 0644 'X11/Xsession.d/60x11-common_xdg_path'
-maybe chmod 0644 'X11/Xsession.d/60xbrlapi'
  maybe chmod 0644 'X11/Xsession.d/65compiz_profile-on-session'
  maybe chmod 0644 'X11/Xsession.d/70gconfd_path-on-session'
  maybe chmod 0644 'X11/Xsession.d/70im-config_launch'
@@ -249,8 +254,6 @@ maybe chmod 0755 'alternatives'
  maybe chmod 0644 'alternatives/README'
  maybe chmod 0644 'anacrontab'
  maybe chmod 0755 'ansible'
-maybe chmod 0644 'ansible/ansible.cfg'
-maybe chmod 0644 'ansible/hosts'
  maybe chmod 0755 'apache2'
  maybe chmod 0755 'apache2/conf-available'
  maybe chmod 0644 'apache2/conf-available/javascript-common.conf'
@@ -266,6 +269,7 @@ maybe chmod 0755 'apm/scripts.d/alsa'
  maybe chmod 0755 'apm/suspend.d'
  maybe chmod 0755 'apparmor'
  maybe chmod 0755 'apparmor.d'
+maybe chmod 0755 'apparmor.d/abi'
  maybe chmod 0755 'apparmor.d/abstractions'
  maybe chmod 0644 'apparmor.d/abstractions/X'
  maybe chmod 0644 'apparmor.d/abstractions/apache2-common'
@@ -503,7 +507,6 @@ maybe chmod 0644 'apparmor.d/usr.sbin.nscd'
  maybe chmod 0644 'apparmor.d/usr.sbin.rsyslogd'
  maybe chmod 0644 'apparmor.d/usr.sbin.smbd'
  maybe chmod 0644 'apparmor.d/usr.sbin.smbldap-useradd'
-maybe chmod 0644 'apparmor.d/usr.sbin.tcpdump'
  maybe chmod 0644 'apparmor.d/usr.sbin.traceroute'
  maybe chmod 0755 'apparmor/init'
  maybe chmod 0755 'apparmor/init/network-interface-security'
@@ -548,6 +551,7 @@ maybe chmod 0644 'apt/apt.conf.d/99synaptic'
  maybe chmod 0644 'apt/apt.conf.d/99update-notifier'
  maybe chmod 0755 'apt/auth.conf.d'
  maybe chmod 0644 'apt/google.gpg-key2.pub'
+maybe chmod 0755 'apt/keyrings'
  maybe chmod 0644 'apt/launchpad-ppa.ubuntu-webupd8team.gpg-key2.pub'
  maybe chmod 0644 'apt/plex.gpg-key2.pub'
  maybe chmod 0755 'apt/preferences.d'
@@ -610,7 +614,6 @@ maybe chmod 0755 'apt/trusted.gpg.d'
  maybe chmod 0644 'apt/trusted.gpg.d/google-chrome.gpg'
  maybe chmod 0644 'apt/trusted.gpg.d/microsoft.gpg'
  maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-defaults.chroot.key.gpg'
-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-2016-dbgsym.gpg'
  maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg'
@@ -779,6 +782,7 @@ maybe chmod 0755 'brltty/Input/ce'
  maybe chmod 0644 'brltty/Input/ce/all.ktb'
  maybe chmod 0644 'brltty/Input/ce/novem.ktb'
  maybe chmod 0644 'brltty/Input/chords.kti'
+maybe chmod 0755 'brltty/Input/cn'
  maybe chmod 0755 'brltty/Input/ec'
  maybe chmod 0644 'brltty/Input/ec/all.txt'
  maybe chmod 0644 'brltty/Input/ec/spanish.txt'
@@ -797,6 +801,7 @@ maybe chmod 0644 'brltty/Input/eu/routing.kti'
  maybe chmod 0644 'brltty/Input/eu/sw12.kti'
  maybe chmod 0644 'brltty/Input/eu/sw34.kti'
  maybe chmod 0644 'brltty/Input/eu/sw56.kti'
+maybe chmod 0755 'brltty/Input/fa'
  maybe chmod 0755 'brltty/Input/fs'
  maybe chmod 0644 'brltty/Input/fs/bumpers.kti'
  maybe chmod 0644 'brltty/Input/fs/common.kti'
@@ -903,6 +908,7 @@ maybe chmod 0644 'brltty/Input/mt/bd1_6.kti'
  maybe chmod 0644 'brltty/Input/mt/bd1_6s.ktb'
  maybe chmod 0644 'brltty/Input/mt/bd2.ktb'
  maybe chmod 0644 'brltty/Input/mt/status.kti'
+maybe chmod 0755 'brltty/Input/no'
  maybe chmod 0755 'brltty/Input/np'
  maybe chmod 0644 'brltty/Input/np/all.ktb'
  maybe chmod 0755 'brltty/Input/pg'
@@ -1135,6 +1141,8 @@ maybe chmod 0755 'chromium-browser/customizations'
  maybe chmod 0755 'chrony'
  maybe chmod 0644 'chrony/chrony.conf'
  maybe chmod 0640 'chrony/chrony.keys'
+maybe chmod 0755 'chrony/conf.d'
+maybe chmod 0755 'chrony/sources.d'
  maybe chmod 0755 'cifs-utils'
  maybe chmod 0700 'cni'
  maybe chmod 0700 'cni/net.d'
@@ -1201,15 +1209,12 @@ maybe chmod 0755 'cron.daily/0anacron'
  maybe chmod 0755 'cron.daily/apport'
  maybe chmod 0755 'cron.daily/apt-compat'
  maybe chmod 0755 'cron.daily/aptitude'
-maybe chmod 0755 'cron.daily/bsdmainutils'
  maybe chmod 0755 'cron.daily/cracklib-runtime'
  maybe chmod 0755 'cron.daily/dpkg'
  maybe chmod 0755 'cron.daily/etckeeper'
  maybe chmod 0755 'cron.daily/logrotate'
  maybe chmod 0755 'cron.daily/man-db'
-maybe chmod 0755 'cron.daily/mlocate'
  maybe chmod 0755 'cron.daily/samba'
-maybe chmod 0755 'cron.daily/update-notifier-common'
  maybe chmod 0755 'cron.hourly'
  maybe chmod 0644 'cron.hourly/.placeholder'
  maybe chmod 0755 'cron.monthly'
@@ -1219,7 +1224,6 @@ maybe chmod 0755 'cron.weekly'
  maybe chmod 0644 'cron.weekly/.placeholder'
  maybe chmod 0755 'cron.weekly/0anacron'
  maybe chmod 0755 'cron.weekly/man-db'
-maybe chmod 0755 'cron.weekly/update-notifier-common'
  maybe chmod 0644 'crontab'
  maybe chmod 0755 'cruft'
  maybe chmod 0755 'cruft/filters-unex'
@@ -1322,7 +1326,6 @@ maybe chmod 0644 'dbus-1/system.d/kerneloops.conf'
  maybe chmod 0644 'dbus-1/system.d/net.hadess.SensorProxy.conf'
  maybe chmod 0644 'dbus-1/system.d/nm-fortisslvpn-service.conf'
  maybe chmod 0644 'dbus-1/system.d/org.debian.apt.conf'
-maybe chmod 0644 'dbus-1/system.d/org.freedesktop.Accounts.conf'
  maybe chmod 0644 'dbus-1/system.d/org.freedesktop.DisplayManager.conf'
  maybe chmod 0644 'dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf'
  maybe chmod 0644 'dbus-1/system.d/org.freedesktop.GeoClue2.conf'
@@ -1354,7 +1357,6 @@ maybe chmod 0644 'default/aufs'
  maybe chmod 0644 'default/avahi-daemon'
  maybe chmod 0644 'default/bind9'
  maybe chmod 0644 'default/bridge-utils'
-maybe chmod 0644 'default/bsdmainutils'
  maybe chmod 0600 'default/cacerts'
  maybe chmod 0644 'default/chrony'
  maybe chmod 0644 'default/console-setup'
@@ -1412,7 +1414,6 @@ maybe chmod 0755 'dhcp'
  maybe chmod 0644 'dhcp/debug'
  maybe chmod 0755 'dhcp/dhclient-enter-hooks.d'
  maybe chmod 0755 'dhcp/dhclient-enter-hooks.d/avahi-autoipd'
-maybe chmod 0755 'dhcp/dhclient-enter-hooks.d/resolved'
  maybe chmod 0755 'dhcp/dhclient-enter-hooks.d/samba'
  maybe chmod 0755 'dhcp/dhclient-exit-hooks.d'
  maybe chmod 0644 'dhcp/dhclient-exit-hooks.d/chrony'
@@ -1663,6 +1664,7 @@ maybe chmod 0755 'gconf/gconf.xml.mandatory'
  maybe chmod 0644 'gconf/gconf.xml.mandatory/%gconf-tree.xml'
  maybe chmod 0755 'gdb'
  maybe chmod 0644 'gdb/gdbinit'
+maybe chmod 0755 'gdb/gdbinit.d'
  maybe chmod 0755 'gdm3'
  maybe chmod 0755 'gdm3/Init'
  maybe chmod 0755 'gdm3/Init/Default'
@@ -1723,6 +1725,7 @@ maybe chmod 0755 'gromit'
  maybe chmod 0644 'gromit/gromitrc'
  maybe chmod 0644 'group'
  maybe chmod 0644 'group-'
+maybe chmod 0644 'group.org'
  maybe chmod 0755 'grub.d'
  maybe chmod 0755 'grub.d/00_header'
  maybe chmod 0755 'grub.d/05_debian_theme'
@@ -2064,7 +2067,6 @@ maybe chmod 0755 'init.d/mintsystem'
  maybe chmod 0755 'init.d/mysql'
  maybe chmod 0755 'init.d/named'
  maybe chmod 0755 'init.d/netfilter-persistent'
-maybe chmod 0755 'init.d/network-manager'
  maybe chmod 0755 'init.d/networking'
  maybe chmod 0755 'init.d/nfs-common'
  maybe chmod 0755 'init.d/nmbd'
@@ -2072,12 +2074,10 @@ maybe chmod 0755 'init.d/openvpn'
  maybe chmod 0755 'init.d/plymouth'
  maybe chmod 0755 'init.d/plymouth-log'
  maybe chmod 0755 'init.d/postfix'
-maybe chmod 0755 'init.d/pppd-dns'
  maybe chmod 0755 'init.d/procps'
  maybe chmod 0755 'init.d/pulseaudio-enable-autospawn'
  maybe chmod 0755 'init.d/rpcbind'
  maybe chmod 0755 'init.d/rsync'
-maybe chmod 0755 'init.d/rsyslog'
  maybe chmod 0755 'init.d/samba-ad-dc'
  maybe chmod 0755 'init.d/saned'
  maybe chmod 0755 'init.d/screen-cleanup'
@@ -2122,6 +2122,7 @@ maybe chmod 0644 'insserv.conf.d/mariadb'
  maybe chmod 0644 'insserv.conf.d/postfix'
  maybe chmod 0644 'insserv.conf.d/rpcbind'
  maybe chmod 0644 'inxi.conf'
+maybe chmod 0755 'ipp-usb'
  maybe chmod 0755 'iproute2'
  maybe chmod 0644 'iproute2/bpf_pinning'
  maybe chmod 0644 'iproute2/ematch_map'
@@ -2217,6 +2218,7 @@ maybe chmod 0755 'kernel/preinst.d/intel-microcode'
  maybe chmod 0755 'kernel/prerm.d'
  maybe chmod 0755 'kernel/prerm.d/dkms'
  maybe chmod 0644 'kerneloops.conf'
+maybe chmod 0755 'keyutils'
  maybe chmod 0644 'ld.so.conf'
  maybe chmod 0755 'ld.so.conf.d'
  maybe chmod 0644 'ld.so.conf.d/fakeroot-x86_64-linux-gnu.conf'
@@ -2239,6 +2241,8 @@ maybe chmod 0755 'libpaper.d'
  maybe chmod 0755 'libreoffice'
  maybe chmod 0644 'libreoffice/postgresql-sdbc.ini'
  maybe chmod 0644 'libreoffice/psprint.conf'
+maybe chmod 0755 'libreoffice/registry'
+maybe chmod 0755 'libreoffice/registry/res'
  maybe chmod 0644 'libreoffice/soffice.sh'
  maybe chmod 0644 'libreoffice/sofficerc'
  maybe chmod 0755 'libvirt'
@@ -2251,24 +2255,6 @@ maybe chmod 0644 'libvirt/libxl-sanlock.conf'
  maybe chmod 0644 'libvirt/libxl.conf'
  maybe chmod 0644 'libvirt/lxc.conf'
  maybe chmod 0755 'libvirt/nwfilter'
-maybe chmod 0600 'libvirt/nwfilter/allow-arp.xml'
-maybe chmod 0600 'libvirt/nwfilter/allow-dhcp-server.xml'
-maybe chmod 0600 'libvirt/nwfilter/allow-dhcp.xml'
-maybe chmod 0600 'libvirt/nwfilter/allow-incoming-ipv4.xml'
-maybe chmod 0600 'libvirt/nwfilter/allow-ipv4.xml'
-maybe chmod 0600 'libvirt/nwfilter/clean-traffic-gateway.xml'
-maybe chmod 0600 'libvirt/nwfilter/clean-traffic.xml'
-maybe chmod 0600 'libvirt/nwfilter/no-arp-ip-spoofing.xml'
-maybe chmod 0600 'libvirt/nwfilter/no-arp-mac-spoofing.xml'
-maybe chmod 0600 'libvirt/nwfilter/no-arp-spoofing.xml'
-maybe chmod 0600 'libvirt/nwfilter/no-ip-multicast.xml'
-maybe chmod 0600 'libvirt/nwfilter/no-ip-spoofing.xml'
-maybe chmod 0600 'libvirt/nwfilter/no-mac-broadcast.xml'
-maybe chmod 0600 'libvirt/nwfilter/no-mac-spoofing.xml'
-maybe chmod 0600 'libvirt/nwfilter/no-other-l2-traffic.xml'
-maybe chmod 0600 'libvirt/nwfilter/no-other-rarp-traffic.xml'
-maybe chmod 0600 'libvirt/nwfilter/qemu-announce-self-rarp.xml'
-maybe chmod 0600 'libvirt/nwfilter/qemu-announce-self.xml'
  maybe chmod 0755 'libvirt/qemu'
  maybe chmod 0644 'libvirt/qemu-lockd.conf'
  maybe chmod 0644 'libvirt/qemu-sanlock.conf'
@@ -2278,12 +2264,10 @@ maybe chmod 0600 'libvirt/qemu/Vera.xml'
  maybe chmod 0600 'libvirt/qemu/centos-stream9.xml'
  maybe chmod 0755 'libvirt/qemu/networks'
  maybe chmod 0755 'libvirt/qemu/networks/autostart'
-maybe chmod 0600 'libvirt/qemu/networks/default.xml'
  maybe chmod 0700 'libvirt/secrets'
  maybe chmod 0755 'libvirt/storage'
  maybe chmod 0755 'libvirt/storage/autostart'
  maybe chmod 0600 'libvirt/storage/default.xml'
-maybe chmod 0644 'libvirt/virt-login-shell.conf'
  maybe chmod 0644 'libvirt/virtlockd.conf'
  maybe chmod 0644 'libvirt/virtlogd.conf'
  maybe chmod 0755 'lightdm'
@@ -2298,7 +2282,6 @@ maybe chmod 0755 'lighttpd'
  maybe chmod 0755 'lighttpd/conf-available'
  maybe chmod 0644 'lighttpd/conf-available/90-javascript-alias.conf'
  maybe chmod 0755 'lighttpd/conf-enabled'
-maybe chmod 0644 'lintianrc'
  maybe chmod 0755 'linuxmint'
  maybe chmod 0644 'linuxmint/info'
  maybe chmod 0644 'linuxmint/mintSystem.conf'
@@ -2315,6 +2298,7 @@ maybe chmod 0644 'logcheck/ignore.d.server/hddtemp'
  maybe chmod 0644 'logcheck/ignore.d.server/libsasl2-modules'
  maybe chmod 0644 'logcheck/ignore.d.server/mariadb-server-10_3'
  maybe chmod 0644 'logcheck/ignore.d.server/mdadm'
+maybe chmod 0755 'logcheck/ignore.d.server/netfilter-persistent'
  maybe chmod 0644 'logcheck/ignore.d.server/ntpdate'
  maybe chmod 0644 'logcheck/ignore.d.server/rsyslog'
  maybe chmod 0755 'logcheck/ignore.d.workstation'
@@ -2383,17 +2367,18 @@ maybe chmod 0755 'mate-settings-daemon/xrandr'
  maybe chmod 0644 'matplotlibrc'
  maybe chmod 0755 'mdadm'
  maybe chmod 0644 'mdadm/mdadm.conf'
+maybe chmod 0755 'mdevctl.d'
  maybe chmod 0755 'menu'
  maybe chmod 0755 'menu-methods'
  maybe chmod 0644 'menu-methods/README'
  maybe chmod 0644 'menu-methods/lang.h'
-maybe chmod 0755 'menu-methods/menu-xdg'
+maybe chmod 0644 'menu-methods/menu-xdg'
  maybe chmod 0644 'menu-methods/menu.config'
  maybe chmod 0644 'menu-methods/menu.h'
  maybe chmod 0644 'menu-methods/translate_menus'
-maybe chmod 0755 'menu-methods/xdg-desktop-entry-spec-apps'
-maybe chmod 0755 'menu-methods/xdg-desktop-entry-spec-dirs'
-maybe chmod 0755 'menu-methods/xdg-desktop-entry-spec-sessions'
+maybe chmod 0644 'menu-methods/xdg-desktop-entry-spec-apps'
+maybe chmod 0644 'menu-methods/xdg-desktop-entry-spec-dirs'
+maybe chmod 0644 'menu-methods/xdg-desktop-entry-spec-sessions'
  maybe chmod 0644 'menu/README'
  maybe chmod 0755 'mercurial'
  maybe chmod 0644 'mercurial/hgrc'
@@ -2491,7 +2476,6 @@ maybe chmod 0755 'network/if-pre-up.d/vde2'
  maybe chmod 0755 'network/if-pre-up.d/wireless-tools'
  maybe chmod 0755 'network/if-up.d'
  maybe chmod 0755 'network/if-up.d/avahi-autoipd'
-maybe chmod 0755 'network/if-up.d/avahi-daemon'
  maybe chmod 0755 'network/if-up.d/bind9'
  maybe chmod 0755 'network/if-up.d/chrony'
  maybe chmod 0755 'network/if-up.d/ethtool'
@@ -2510,6 +2494,7 @@ maybe chmod 0644 'networks'
  maybe chmod 0755 'newt'
  maybe chmod 0644 'newt/palette.original'
  maybe chmod 0644 'newt/palette.ubuntu'
+maybe chmod 0755 'nfs.conf.d'
  maybe chmod 0644 'nsswitch.conf'
  maybe chmod 0755 'obex-data-server'
  maybe chmod 0644 'obex-data-server/capability.xml'
@@ -2519,6 +2504,7 @@ maybe chmod 0644 'openal/alsoft.conf'
  maybe chmod 0755 'openfortivpn'
  maybe chmod 0644 'openfortivpn/config'
  maybe chmod 0644 'openfortivpn/config.orig'
+maybe chmod 0755 'openni2'
  maybe chmod 0755 'openvpn'
  maybe chmod 0755 'openvpn/client'
  maybe chmod 0755 'openvpn/server'
@@ -2558,11 +2544,11 @@ maybe chmod 0644 'pam.d/sshd'
  maybe chmod 0644 'pam.d/su'
  maybe chmod 0644 'pam.d/su-l'
  maybe chmod 0644 'pam.d/sudo'
-maybe chmod 0644 'pam.d/systemd-user'
  maybe chmod 0644 'pam.d/xpra'
  maybe chmod 0644 'papersize'
  maybe chmod 0644 'passwd'
  maybe chmod 0644 'passwd-'
+maybe chmod 0644 'passwd.org'
  maybe chmod 0755 'pcmcia'
  maybe chmod 0644 'pcmcia/config.opts'
  maybe chmod 0755 'perl'
@@ -2636,6 +2622,7 @@ maybe chmod 0755 'ppp/ip-down.d/0dns-down'
  maybe chmod 0755 'ppp/ip-down.d/bind9'
  maybe chmod 0755 'ppp/ip-down.d/chrony'
  maybe chmod 0755 'ppp/ip-down.d/postfix'
+maybe chmod 0755 'ppp/ip-pre-up.d'
  maybe chmod 0755 'ppp/ip-up'
  maybe chmod 0755 'ppp/ip-up.d'
  maybe chmod 0755 'ppp/ip-up.d/0000usepeerdns'
@@ -2680,10 +2667,13 @@ maybe chmod 0644 'pulse/client.conf'
  maybe chmod 0755 'pulse/client.conf.d'
  maybe chmod 0644 'pulse/daemon.conf'
  maybe chmod 0644 'pulse/default.pa'
+maybe chmod 0755 'pulse/default.pa.d'
  maybe chmod 0644 'pulse/system.pa'
  maybe chmod 0755 'python2.7'
  maybe chmod 0644 'python2.7/sitecustomize.py'
  maybe chmod 0755 'python3'
+maybe chmod 0755 'python3.10'
+maybe chmod 0644 'python3.10/sitecustomize.py'
  maybe chmod 0755 'python3.6'
  maybe chmod 0644 'python3.6/sitecustomize.py'
  maybe chmod 0755 'python3.8'
@@ -2710,7 +2700,6 @@ maybe chmod 0644 'resolv.conf.dpx'
  maybe chmod 0644 'resolv.conf.non-dpx'
  maybe chmod 0755 'resolvconf'
  maybe chmod 0755 'resolvconf/update-libc.d'
-maybe chmod 0755 'resolvconf/update-libc.d/avahi-daemon'
  maybe chmod 0755 'resolvconf/update-libc.d/postfix'
  maybe chmod 0644 'rpc'
  maybe chmod 0644 'rsyslog.conf'
@@ -2871,13 +2860,14 @@ maybe chmod 0755 'sgml/docbook/4.4'
  maybe chmod 0644 'sgml/docbook/4.4/dbgenent.mod'
  maybe chmod 0755 'sgml/docbook/4.5'
  maybe chmod 0644 'sgml/docbook/4.5/dbgenent.mod'
-maybe chmod 0644 'sgml/metacity-common.cat'
  maybe chmod 0644 'sgml/sgml-data.cat'
  maybe chmod 0644 'sgml/xml-core.cat'
  maybe chgrp 'shadow' 'shadow'
  maybe chmod 0640 'shadow'
  maybe chgrp 'shadow' 'shadow-'
  maybe chmod 0640 'shadow-'
+maybe chgrp 'shadow' 'shadow.org'
+maybe chmod 0640 'shadow.org'
  maybe chmod 0644 'shells'
  maybe chmod 0755 'skel'
  maybe chmod 0644 'skel/.bash_logout'
@@ -2933,23 +2923,17 @@ maybe chmod 0755 'speech-dispatcher'
  maybe chmod 0755 'speech-dispatcher/clients'
  maybe chmod 0644 'speech-dispatcher/clients/emacs.conf'
  maybe chmod 0755 'speech-dispatcher/modules'
-maybe chmod 0644 'speech-dispatcher/modules/baratinoo.conf'
  maybe chmod 0644 'speech-dispatcher/modules/cicero.conf'
  maybe chmod 0644 'speech-dispatcher/modules/dtk-generic.conf'
  maybe chmod 0644 'speech-dispatcher/modules/epos-generic.conf'
-maybe chmod 0644 'speech-dispatcher/modules/espeak-generic.conf'
  maybe chmod 0644 'speech-dispatcher/modules/espeak-mbrola-generic.conf'
  maybe chmod 0644 'speech-dispatcher/modules/espeak-ng-mbrola-generic.conf'
  maybe chmod 0644 'speech-dispatcher/modules/espeak-ng.conf'
  maybe chmod 0644 'speech-dispatcher/modules/espeak.conf'
  maybe chmod 0644 'speech-dispatcher/modules/festival.conf'
  maybe chmod 0644 'speech-dispatcher/modules/flite.conf'
-maybe chmod 0644 'speech-dispatcher/modules/ibmtts.conf'
-maybe chmod 0644 'speech-dispatcher/modules/ivona.conf'
-maybe chmod 0644 'speech-dispatcher/modules/kali.conf'
  maybe chmod 0644 'speech-dispatcher/modules/llia_phon-generic.conf'
  maybe chmod 0644 'speech-dispatcher/modules/mary-generic.conf'
-maybe chmod 0644 'speech-dispatcher/modules/pico-generic.conf'
  maybe chmod 0644 'speech-dispatcher/modules/swift-generic.conf'
  maybe chmod 0644 'speech-dispatcher/speechd.conf'
  maybe chmod 0755 'ssh'
@@ -3075,6 +3059,7 @@ maybe chmod 0755 'systemd/system/zfs.target.wants'
  maybe chmod 0755 'systemd/user'
  maybe chmod 0644 'systemd/user.conf'
  maybe chmod 0755 'systemd/user/default.target.wants'
+maybe chmod 0755 'systemd/user/graphical-session-pre.target.wants'
  maybe chmod 0755 'systemd/user/sockets.target.wants'
  maybe chmod 0755 'terminfo'
  maybe chmod 0644 'terminfo/README'
@@ -3203,7 +3188,6 @@ maybe chmod 0644 'xdg/autostart/mint-ctrl-alt-backspace.desktop'
  maybe chmod 0644 'xdg/autostart/mintreport.desktop'
  maybe chmod 0644 'xdg/autostart/mintupdate.desktop'
  maybe chmod 0644 'xdg/autostart/mintwelcome.desktop'
-maybe chmod 0644 'xdg/autostart/nautilus-autostart.desktop'
  maybe chmod 0644 'xdg/autostart/nm-applet.desktop'
  maybe chmod 0644 'xdg/autostart/nvidia-prime.desktop'
  maybe chmod 0644 'xdg/autostart/onboard-autostart.desktop'
@@ -3234,27 +3218,14 @@ maybe chmod 0644 'xdg/autostart/pulseaudio.desktop'
  maybe chmod 0644 'xdg/autostart/smart-notifier.desktop'
  maybe chmod 0644 'xdg/autostart/snap-userd-autostart.desktop'
  maybe chmod 0644 'xdg/autostart/sticky.desktop'
-maybe chmod 0644 'xdg/autostart/tracker-extract.desktop'
-maybe chmod 0644 'xdg/autostart/tracker-miner-fs.desktop'
-maybe chmod 0644 'xdg/autostart/tracker-store.desktop'
  maybe chmod 0644 'xdg/autostart/user-dirs-update-gtk.desktop'
  maybe chmod 0644 'xdg/autostart/warpinator-autostart.desktop'
  maybe chmod 0644 'xdg/autostart/xapp-sn-watcher.desktop'
  maybe chmod 0644 'xdg/autostart/xdg-user-dirs.desktop'
  maybe chmod 0644 'xdg/fcitx-skin.knsrc'
-maybe chmod 0644 'xdg/katomic.knsrc'
-maybe chmod 0644 'xdg/kblocks.knsrc'
-maybe chmod 0644 'xdg/kcardtheme.knsrc'
-maybe chmod 0644 'xdg/kdiamond.knsrc'
  maybe chmod 0644 'xdg/kglobalaccel.categories'
-maybe chmod 0644 'xdg/kgoldrunner.knsrc'
  maybe chmod 0644 'xdg/khangman.knsrc'
-maybe chmod 0644 'xdg/kigo-games.knsrc'
-maybe chmod 0644 'xdg/kigo.knsrc'
-maybe chmod 0644 'xdg/kpat.knsrc'
  maybe chmod 0644 'xdg/kshorturifilterrc'
-maybe chmod 0644 'xdg/ksirk.knsrc'
-maybe chmod 0644 'xdg/ksnakeduel.knsrc'
  maybe chmod 0644 'xdg/ksudokurc'
  maybe chmod 0755 'xdg/menus'
  maybe chmod 0755 'xdg/menus/applications-merged'
@@ -3274,10 +3245,7 @@ maybe chmod 0644 'xdg/user-dirs.conf'
  maybe chmod 0644 'xdg/user-dirs.defaults'
  maybe chmod 0755 'xml'
  maybe chmod 0644 'xml/catalog'
-maybe chmod 0644 'xml/docbook-xml.xml'
-maybe chmod 0644 'xml/docbook-xsl.xml'
  maybe chmod 0644 'xml/rarian-compat.xml'
-maybe chmod 0644 'xml/sgml-data.xml'
  maybe chmod 0644 'xml/xml-core.xml'
  maybe chmod 0755 'xpra'
  maybe chmod 0755 'xpra/conf.d'
diff --git a/NetworkManager/dispatcher.d/20-chrony b/NetworkManager/dispatcher.d/20-chrony

deleted file mode 100755 (executable)

index 0b0c3e7..0000000
--- a/NetworkManager/dispatcher.d/20-chrony
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# This is a NetworkManager dispatcher / networkd-dispatcher script for
-# chronyd to set its NTP sources online or offline when a network interface
-# is configured or removed
-
-export LC_ALL=C
-
-# For NetworkManager consider only up/down events
-[ $# -ge 2 ] && [ "$2" != "up" ] && [ "$2" != "down" ] && exit 0
-
-# Note: for networkd-dispatcher routable.d ~= on and off.d ~= off
-
-chronyc onoffline > /dev/null 2>&1
-
-exit 0
diff --git a/X11/Xsession b/X11/Xsession

index 6b071c74ca9027b05c5674d14dcd87ce8602adb0..58cd30556de46d619dfd346eee6c93a4f5430f55 100755 (executable)
--- a/X11/Xsession
+++ b/X11/Xsession
@@ -15,7 +15,7 @@ message () {
    # is available and $DISPLAY is set
    MESSAGE="$PROGNAME: $*"
    echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2
-  if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
+  if [ -n "$DISPLAY" ] && command -v xmessage > /dev/null 2>&1; then
      echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
    fi
  }
@@ -25,7 +25,7 @@ message_nonl () {
    # xmessage if it is available and $DISPLAY is set
    MESSAGE="$PROGNAME: $*"
    echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2;
-  if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
+  if [ -n "$DISPLAY" ] && command -v xmessage > /dev/null 2>&1; then
      echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
    fi
  }
@@ -60,11 +60,29 @@ USERXSESSIONRC=$HOME/.xsessionrc
  ALTUSERXSESSION=$HOME/.Xsession
  ERRFILE=$HOME/.xsession-errors
  
+OPTIONS="$(
+  if [ -r "$OPTIONFILE" ]; then
+    cat "$OPTIONFILE"
+  fi
+  if [ -d /etc/X11/Xsession.options.d ]; then
+    run-parts --list --regex '\.conf$' /etc/X11/Xsession.options.d | xargs -d '\n' cat
+  fi
+)"
+
+has_option() {
+  # Ensure that a later no-foo overrides an earlier foo
+  if [ "$(echo "$OPTIONS" | grep -Eo "^(no-)?$1\>" | tail -n 1)" = "$1" ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
  # attempt to create an error file; abort if we cannot
  if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] &&
    [ ! -L "$ERRFILE" ]; then
    chmod 600 "$ERRFILE"
-elif ERRFILE=$(tempfile 2> /dev/null); then
+elif ERRFILE=$(mktemp 2> /dev/null); then
    if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-$USER"; then
      message "warning: unable to symlink \"$TMPDIR/xsession-$USER\" to" \
               "\"$ERRFILE\"; look for session log/errors in" \
@@ -92,9 +110,9 @@ fi
  # Attempt to create a file of non-zero length in /tmp; a full filesystem can
  # cause mysterious X session failures.  We do not use touch, :, or test -w
  # because they won't actually create a file with contents.  We also let standard
-# error from tempfile and echo go to the error file to aid the user in
+# error from mktemp and echo go to the error file to aid the user in
  # determining what went wrong.
-WRITE_TEST=$(tempfile)
+WRITE_TEST=$(mktemp)
  if ! echo "*" >>"$WRITE_TEST"; then
    message "warning: unable to write to ${WRITE_TEST%/*}; X session may exit" \
            "with an error"
diff --git a/X11/Xsession.d/20x11-common_process-args b/X11/Xsession.d/20x11-common_process-args

index 149d1d25648ebeee9d89c09039cdfe98e1621352..3ccea2e4b9387117d4cf57d91b87cacc203eb225 100644 (file)
--- a/X11/Xsession.d/20x11-common_process-args
+++ b/X11/Xsession.d/20x11-common_process-args
@@ -2,18 +2,6 @@
  
  # This file is sourced by Xsession(5), not executed.
  
-# read OPTIONFILE
-OPTIONS=$(cat "$OPTIONFILE") || true
-
-has_option() {
-  if [ "${OPTIONS#*
-$1}" != "$OPTIONS" ]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
  # Determine how many arguments were provided.
  case $# in
    0)
@@ -45,7 +33,7 @@ case $# in
          ;;
        *)
          # Specific program was requested.
-        STARTUP_FULL_PATH=$(/usr/bin/which "${1%% *}" || true)
+        STARTUP_FULL_PATH=$(command -v "${1%% *}" || true)
          if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
            if [ -x "$STARTUP_FULL_PATH" ]; then
              STARTUP="$1"
diff --git a/X11/Xsession.d/60xbrlapi b/X11/Xsession.d/60xbrlapi

deleted file mode 100644 (file)

index 32f92a0..0000000
--- a/X11/Xsession.d/60xbrlapi
+++ /dev/null
@@ -1 +0,0 @@
-if [ -x /usr/bin/xbrlapi ]; then /usr/bin/xbrlapi -q 2> /dev/null & fi
diff --git a/X11/Xsession.d/90x11-common_ssh-agent b/X11/Xsession.d/90x11-common_ssh-agent

index 53974340d5e52661821990e74d58f190b98b7d57..70bd01b671bd3fd5d8fe11c162f7b275d37f8493 100644 (file)
--- a/X11/Xsession.d/90x11-common_ssh-agent
+++ b/X11/Xsession.d/90x11-common_ssh-agent
@@ -7,18 +7,9 @@ SSHAGENT=/usr/bin/ssh-agent
  SSHAGENTARGS=
  
  if has_option use-ssh-agent; then
-  if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \
-     && [ -z "$SSH2_AUTH_SOCK" ]; then
-    STARTSSH=yes
-    if [ -f /usr/bin/ssh-add1 ] && cmp -s $SSHAGENT /usr/bin/ssh-agent2; then
-      # use ssh-agent2's ssh-agent1 compatibility mode
-      SSHAGENTARGS=-1
-    fi
+  if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+    STARTUP="$SSHAGENT $SSHAGENTARGS ${TMPDIR:+env TMPDIR=$TMPDIR} $STARTUP"
    fi
  fi
  
-if [ -n "$STARTSSH" ]; then
-  STARTUP="$SSHAGENT $SSHAGENTARGS ${TMPDIR:+env TMPDIR=$TMPDIR} $STARTUP"
-fi
-
  # vim:set ai et sts=2 sw=2 tw=80:
diff --git a/X11/xinit/xinput.d/ja_JP b/X11/xinit/xinput.d/ja_JP

deleted file mode 120000 (symlink)

index 8ca83a0..0000000
--- a/X11/xinit/xinput.d/ja_JP
+++ /dev/null
@@ -1 +0,0 @@
-/etc/alternatives/xinput-ja_JP
-\ No newline at end of file
diff --git a/X11/xinit/xinput.d/ko_KR b/X11/xinit/xinput.d/ko_KR

deleted file mode 120000 (symlink)

index d44bbc1..0000000
--- a/X11/xinit/xinput.d/ko_KR
+++ /dev/null
@@ -1 +0,0 @@
-/etc/alternatives/xinput-ko_KR
-\ No newline at end of file
diff --git a/X11/xinit/xinput.d/zh_CN b/X11/xinit/xinput.d/zh_CN

deleted file mode 120000 (symlink)

index 672fe2e..0000000
--- a/X11/xinit/xinput.d/zh_CN
+++ /dev/null
@@ -1 +0,0 @@
-/etc/alternatives/xinput-zh_CN
-\ No newline at end of file
diff --git a/X11/xinit/xinput.d/zh_HK b/X11/xinit/xinput.d/zh_HK

deleted file mode 120000 (symlink)

index 9993bed..0000000
--- a/X11/xinit/xinput.d/zh_HK
+++ /dev/null
@@ -1 +0,0 @@
-/etc/alternatives/xinput-zh_HK
-\ No newline at end of file
diff --git a/X11/xinit/xinput.d/zh_SG b/X11/xinit/xinput.d/zh_SG

deleted file mode 120000 (symlink)

index c539c8c..0000000
--- a/X11/xinit/xinput.d/zh_SG
+++ /dev/null
@@ -1 +0,0 @@
-/etc/alternatives/xinput-zh_SG
-\ No newline at end of file
diff --git a/X11/xinit/xinput.d/zh_TW b/X11/xinit/xinput.d/zh_TW

deleted file mode 120000 (symlink)

index db38c3e..0000000
--- a/X11/xinit/xinput.d/zh_TW
+++ /dev/null
@@ -1 +0,0 @@
-/etc/alternatives/xinput-zh_TW
-\ No newline at end of file
diff --git a/alternatives/Mail b/alternatives/Mail

new file mode 120000 (symlink)

index 0000000..20f6356
--- /dev/null
+++ b/alternatives/Mail
@@ -0,0 +1 @@
+/usr/bin/bsd-mailx
+\ No newline at end of file
diff --git a/alternatives/Mail.1.gz b/alternatives/Mail.1.gz

new file mode 120000 (symlink)

index 0000000..8f9c194
--- /dev/null
+++ b/alternatives/Mail.1.gz
@@ -0,0 +1 @@
+/usr/share/man/man1/bsd-mailx.1.gz
+\ No newline at end of file
diff --git a/alternatives/dotlock b/alternatives/dotlock

deleted file mode 120000 (symlink)

index 423e888..0000000
--- a/alternatives/dotlock
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/dotlock.mailutils
-\ No newline at end of file
diff --git a/alternatives/dotlock.1.gz b/alternatives/dotlock.1.gz

deleted file mode 120000 (symlink)

index 48fb595..0000000
--- a/alternatives/dotlock.1.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man1/dotlock.mailutils.1.gz
-\ No newline at end of file
diff --git a/alternatives/ebtables b/alternatives/ebtables

index a4267f8db01718d5c03fcfc3e8510f8111f7478e..8d5f660c706a1a293eaf6576c1322db2c5fd422c 120000 (symlink)
--- a/alternatives/ebtables
+++ b/alternatives/ebtables
@@ -1 +1 @@
-/usr/sbin/ebtables-legacy
-\ No newline at end of file
+/usr/sbin/ebtables-nft
+\ No newline at end of file
diff --git a/alternatives/ebtables-restore b/alternatives/ebtables-restore

index 3ec0ed5534f51b2f47da300cd30981f13ee073f1..c2e5813be42e5078a22a14933b52d709a60e6ab3 120000 (symlink)
--- a/alternatives/ebtables-restore
+++ b/alternatives/ebtables-restore
@@ -1 +1 @@
-/usr/sbin/ebtables-legacy-restore
-\ No newline at end of file
+/usr/sbin/ebtables-nft-restore
+\ No newline at end of file
diff --git a/alternatives/ebtables-save b/alternatives/ebtables-save

index fadfcf36f20382fc10d70ea3c6ed102804281223..600f8c2dce37f0c33e44499baee6fda35262ba8d 120000 (symlink)
--- a/alternatives/ebtables-save
+++ b/alternatives/ebtables-save
@@ -1 +1 @@
-/usr/sbin/ebtables-legacy-save
-\ No newline at end of file
+/usr/sbin/ebtables-nft-save
+\ No newline at end of file
diff --git a/alternatives/frm b/alternatives/frm

deleted file mode 120000 (symlink)

index def5353..0000000
--- a/alternatives/frm
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/frm.mailutils
-\ No newline at end of file
diff --git a/alternatives/frm.1.gz b/alternatives/frm.1.gz

deleted file mode 120000 (symlink)

index ec4c491..0000000
--- a/alternatives/frm.1.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man1/frm.mailutils.1.gz
-\ No newline at end of file
diff --git a/alternatives/from b/alternatives/from

deleted file mode 120000 (symlink)

index f4e6cdc..0000000
--- a/alternatives/from
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/from.mailutils
-\ No newline at end of file
diff --git a/alternatives/from.1.gz b/alternatives/from.1.gz

deleted file mode 120000 (symlink)

index d20001a..0000000
--- a/alternatives/from.1.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man1/from.mailutils.1.gz
-\ No newline at end of file
diff --git a/alternatives/ftp b/alternatives/ftp

deleted file mode 120000 (symlink)

index f0ae93f..0000000
--- a/alternatives/ftp
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/netkit-ftp
-\ No newline at end of file
diff --git a/alternatives/ftp.1.gz b/alternatives/ftp.1.gz

deleted file mode 120000 (symlink)

index 5b3a00b..0000000
--- a/alternatives/ftp.1.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man1/netkit-ftp.1.gz
-\ No newline at end of file
diff --git a/alternatives/gdm3-theme.gresource b/alternatives/gdm3-theme.gresource

deleted file mode 120000 (symlink)

index bffa866..0000000
--- a/alternatives/gdm3-theme.gresource
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/gnome-shell/gnome-shell-theme.gresource
-\ No newline at end of file
diff --git a/alternatives/ip6tables b/alternatives/ip6tables

index 0b2891fc92a0f7237393ab5f2ae0bca6b389b72b..4c913e2db4e2d630d9154ab17e25df71faa99c95 120000 (symlink)
--- a/alternatives/ip6tables
+++ b/alternatives/ip6tables
@@ -1 +1 @@
-/usr/sbin/ip6tables-legacy
-\ No newline at end of file
+/usr/sbin/ip6tables-nft
+\ No newline at end of file
diff --git a/alternatives/ip6tables-restore b/alternatives/ip6tables-restore

index 7bedefc202d47a209f657d52e9cd92842f54efc3..46918a9c5bfe745cc5c1c4ff44d598ba644c748a 120000 (symlink)
--- a/alternatives/ip6tables-restore
+++ b/alternatives/ip6tables-restore
@@ -1 +1 @@
-/usr/sbin/ip6tables-legacy-restore
-\ No newline at end of file
+/usr/sbin/ip6tables-nft-restore
+\ No newline at end of file
diff --git a/alternatives/ip6tables-save b/alternatives/ip6tables-save

index 502f99a201ab6a16b3eddd5e4f664cbdd511c6b3..04525f055f3f6c07696736168219b89e3dea7a48 120000 (symlink)
--- a/alternatives/ip6tables-save
+++ b/alternatives/ip6tables-save
@@ -1 +1 @@
-/usr/sbin/ip6tables-legacy-save
-\ No newline at end of file
+/usr/sbin/ip6tables-nft-save
+\ No newline at end of file
diff --git a/alternatives/ip6tables.service b/alternatives/ip6tables.service

deleted file mode 120000 (symlink)

index 8589be0..0000000
--- a/alternatives/ip6tables.service
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/netfilter-persistent.service
-\ No newline at end of file
diff --git a/alternatives/iptables b/alternatives/iptables

index cc3947247d57b95ee9cc96d11d92b340fd221b20..c55fd508e7cffa2c3b81924dcadaf8f5bab0d0a8 120000 (symlink)
--- a/alternatives/iptables
+++ b/alternatives/iptables
@@ -1 +1 @@
-/usr/sbin/iptables-legacy
-\ No newline at end of file
+/usr/sbin/iptables-nft
+\ No newline at end of file
diff --git a/alternatives/iptables-restore b/alternatives/iptables-restore

index 2293ced30cac89a8e1c5d905d198104be78a4c54..9553657e1ed3e3c897fc5bc1696b4664c894e7a8 120000 (symlink)
--- a/alternatives/iptables-restore
+++ b/alternatives/iptables-restore
@@ -1 +1 @@
-/usr/sbin/iptables-legacy-restore
-\ No newline at end of file
+/usr/sbin/iptables-nft-restore
+\ No newline at end of file
diff --git a/alternatives/iptables-save b/alternatives/iptables-save

index eaf74bbbd3bc66c2ebd023735efff4fa9d9774df..051d68bd2ee491dd27ec03975600d51f03fd7e71 120000 (symlink)
--- a/alternatives/iptables-save
+++ b/alternatives/iptables-save
@@ -1 +1 @@
-/usr/sbin/iptables-legacy-save
-\ No newline at end of file
+/usr/sbin/iptables-nft-save
+\ No newline at end of file
diff --git a/alternatives/iptables.service b/alternatives/iptables.service

deleted file mode 120000 (symlink)

index 8589be0..0000000
--- a/alternatives/iptables.service
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/netfilter-persistent.service
-\ No newline at end of file
diff --git a/alternatives/lzip b/alternatives/lzip

deleted file mode 120000 (symlink)

index f4424c4..0000000
--- a/alternatives/lzip
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/lzip.lzip
-\ No newline at end of file
diff --git a/alternatives/lzip-compressor b/alternatives/lzip-compressor

deleted file mode 120000 (symlink)

index f4424c4..0000000
--- a/alternatives/lzip-compressor
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/lzip.lzip
-\ No newline at end of file
diff --git a/alternatives/lzip-compressor.1.gz b/alternatives/lzip-compressor.1.gz

deleted file mode 120000 (symlink)

index 25a4af1..0000000
--- a/alternatives/lzip-compressor.1.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man1/lzip.lzip.1.gz
-\ No newline at end of file
diff --git a/alternatives/lzip-compressor.info.gz b/alternatives/lzip-compressor.info.gz

deleted file mode 120000 (symlink)

index 1b80087..0000000
--- a/alternatives/lzip-compressor.info.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/info/lzip.lzip.info.gz
-\ No newline at end of file
diff --git a/alternatives/lzip-decompressor b/alternatives/lzip-decompressor

deleted file mode 120000 (symlink)

index f4424c4..0000000
--- a/alternatives/lzip-decompressor
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/lzip.lzip
-\ No newline at end of file
diff --git a/alternatives/lzip-decompressor.1.gz b/alternatives/lzip-decompressor.1.gz

deleted file mode 120000 (symlink)

index 25a4af1..0000000
--- a/alternatives/lzip-decompressor.1.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man1/lzip.lzip.1.gz
-\ No newline at end of file
diff --git a/alternatives/lzip-decompressor.info.gz b/alternatives/lzip-decompressor.info.gz

deleted file mode 120000 (symlink)

index 1b80087..0000000
--- a/alternatives/lzip-decompressor.info.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/info/lzip.lzip.info.gz
-\ No newline at end of file
diff --git a/alternatives/lzip.1.gz b/alternatives/lzip.1.gz

deleted file mode 120000 (symlink)

index 25a4af1..0000000
--- a/alternatives/lzip.1.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man1/lzip.lzip.1.gz
-\ No newline at end of file
diff --git a/alternatives/lzip.info.gz b/alternatives/lzip.info.gz

deleted file mode 120000 (symlink)

index 1b80087..0000000
--- a/alternatives/lzip.info.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/info/lzip.lzip.info.gz
-\ No newline at end of file
diff --git a/alternatives/mail b/alternatives/mail

index e4c76436fa3a4ea5929e3b9ead948e5c67bba66d..20f6356be4f6c720297ac276c9a4a47d8436a094 120000 (symlink)
--- a/alternatives/mail
+++ b/alternatives/mail
@@ -1 +1 @@
-/usr/bin/mail.mailutils
-\ No newline at end of file
+/usr/bin/bsd-mailx
+\ No newline at end of file
diff --git a/alternatives/mail.1.gz b/alternatives/mail.1.gz

index b8055c838cb3e4a5e800779f877dd6ac531f43b0..8f9c19459e0ff7190ee993de2af7e592bc299c38 120000 (symlink)
--- a/alternatives/mail.1.gz
+++ b/alternatives/mail.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/mail.mailutils.1.gz
-\ No newline at end of file
+/usr/share/man/man1/bsd-mailx.1.gz
+\ No newline at end of file
diff --git a/alternatives/mailx b/alternatives/mailx

index e4c76436fa3a4ea5929e3b9ead948e5c67bba66d..20f6356be4f6c720297ac276c9a4a47d8436a094 120000 (symlink)
--- a/alternatives/mailx
+++ b/alternatives/mailx
@@ -1 +1 @@
-/usr/bin/mail.mailutils
-\ No newline at end of file
+/usr/bin/bsd-mailx
+\ No newline at end of file
diff --git a/alternatives/mailx.1.gz b/alternatives/mailx.1.gz

index b8055c838cb3e4a5e800779f877dd6ac531f43b0..8f9c19459e0ff7190ee993de2af7e592bc299c38 120000 (symlink)
--- a/alternatives/mailx.1.gz
+++ b/alternatives/mailx.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/mail.mailutils.1.gz
-\ No newline at end of file
+/usr/share/man/man1/bsd-mailx.1.gz
+\ No newline at end of file
diff --git a/alternatives/messages b/alternatives/messages

deleted file mode 120000 (symlink)

index e66edd3..0000000
--- a/alternatives/messages
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/messages.mailutils
-\ No newline at end of file
diff --git a/alternatives/messages.1.gz b/alternatives/messages.1.gz

deleted file mode 120000 (symlink)

index 8884760..0000000
--- a/alternatives/messages.1.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man1/messages.mailutils.1.gz
-\ No newline at end of file
diff --git a/alternatives/movemail b/alternatives/movemail

deleted file mode 120000 (symlink)

index 8d4efb3..0000000
--- a/alternatives/movemail
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/movemail.mailutils
-\ No newline at end of file
diff --git a/alternatives/movemail.1.gz b/alternatives/movemail.1.gz

deleted file mode 120000 (symlink)

index 32b3520..0000000
--- a/alternatives/movemail.1.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man1/movemail.mailutils.1.gz
-\ No newline at end of file
diff --git a/alternatives/netrc.5.gz b/alternatives/netrc.5.gz

deleted file mode 120000 (symlink)

index 5702a2c..0000000
--- a/alternatives/netrc.5.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man5/netkit-netrc.5.gz
-\ No newline at end of file
diff --git a/alternatives/open b/alternatives/open

new file mode 120000 (symlink)

index 0000000..9f54a4b
--- /dev/null
+++ b/alternatives/open
@@ -0,0 +1 @@
+/usr/bin/xdg-open
+\ No newline at end of file
diff --git a/alternatives/open.1.gz b/alternatives/open.1.gz

new file mode 120000 (symlink)

index 0000000..edf6650
--- /dev/null
+++ b/alternatives/open.1.gz
@@ -0,0 +1 @@
+/usr/share/man/man1/xdg-open.1.gz
+\ No newline at end of file
diff --git a/alternatives/pftp b/alternatives/pftp

deleted file mode 120000 (symlink)

index f0ae93f..0000000
--- a/alternatives/pftp
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/netkit-ftp
-\ No newline at end of file
diff --git a/alternatives/pftp.1.gz b/alternatives/pftp.1.gz

deleted file mode 120000 (symlink)

index 5b3a00b..0000000
--- a/alternatives/pftp.1.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man1/netkit-ftp.1.gz
-\ No newline at end of file
diff --git a/alternatives/pybabel b/alternatives/pybabel

index 3f4849de4a33ad623390c4c34348d2f871a54496..269ae50237ca80cfe6c22fe6cc55be2d14f274de 120000 (symlink)
--- a/alternatives/pybabel
+++ b/alternatives/pybabel
@@ -1 +1 @@
-/usr/bin/pybabel-python2
-\ No newline at end of file
+/usr/bin/pybabel-python3
+\ No newline at end of file
diff --git a/alternatives/readmsg b/alternatives/readmsg

deleted file mode 120000 (symlink)

index 99bcf73..0000000
--- a/alternatives/readmsg
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/readmsg.mailutils
-\ No newline at end of file
diff --git a/alternatives/readmsg.1.gz b/alternatives/readmsg.1.gz

deleted file mode 120000 (symlink)

index 322d3a6..0000000
--- a/alternatives/readmsg.1.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man1/readmsg.mailutils.1.gz
-\ No newline at end of file
diff --git a/alternatives/tdbbackup b/alternatives/tdbbackup

deleted file mode 120000 (symlink)

index 3edf584..0000000
--- a/alternatives/tdbbackup
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/tdbbackup.tdbtools
-\ No newline at end of file
diff --git a/alternatives/tdbbackup.8.gz b/alternatives/tdbbackup.8.gz

deleted file mode 120000 (symlink)

index c910beb..0000000
--- a/alternatives/tdbbackup.8.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man8/tdbbackup.tdbtools.8.gz
-\ No newline at end of file
diff --git a/alternatives/traceroute6 b/alternatives/traceroute6

index 7554b5547406ecb85114cf4c44a7a8bf40280508..7958fcf4e9db63244aab23bd7de727d7a2f4b555 120000 (symlink)
--- a/alternatives/traceroute6
+++ b/alternatives/traceroute6
@@ -1 +1 @@
-/usr/bin/traceroute6.iputils
-\ No newline at end of file
+/usr/bin/traceroute6.db
+\ No newline at end of file
diff --git a/alternatives/traceroute6.1.gz b/alternatives/traceroute6.1.gz

new file mode 120000 (symlink)

index 0000000..7977291
--- /dev/null
+++ b/alternatives/traceroute6.1.gz
@@ -0,0 +1 @@
+/usr/share/man/man1/traceroute6.db.1.gz
+\ No newline at end of file
diff --git a/alternatives/traceroute6.8.gz b/alternatives/traceroute6.8.gz

deleted file mode 120000 (symlink)

index e69934c..0000000
--- a/alternatives/traceroute6.8.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man8/traceroute6.iputils.8.gz
-\ No newline at end of file
diff --git a/alternatives/w b/alternatives/w

deleted file mode 120000 (symlink)

index 11c34c4..0000000
--- a/alternatives/w
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/w.procps
-\ No newline at end of file
diff --git a/alternatives/w.1.gz b/alternatives/w.1.gz

deleted file mode 120000 (symlink)

index 7391b64..0000000
--- a/alternatives/w.1.gz
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man1/w.procps.1.gz
-\ No newline at end of file
diff --git a/alternatives/which b/alternatives/which

new file mode 120000 (symlink)

index 0000000..c9eb809
--- /dev/null
+++ b/alternatives/which
@@ -0,0 +1 @@
+/usr/bin/which.debianutils
+\ No newline at end of file
diff --git a/alternatives/which.1.gz b/alternatives/which.1.gz

new file mode 120000 (symlink)

index 0000000..e5966c9
--- /dev/null
+++ b/alternatives/which.1.gz
@@ -0,0 +1 @@
+/usr/share/man/man1/which.debianutils.1.gz
+\ No newline at end of file
diff --git a/alternatives/which.de1.gz b/alternatives/which.de1.gz

new file mode 120000 (symlink)

index 0000000..62b7dbb
--- /dev/null
+++ b/alternatives/which.de1.gz
@@ -0,0 +1 @@
+/usr/share/man/de/man1/which.debianutils.1.gz
+\ No newline at end of file
diff --git a/alternatives/which.es1.gz b/alternatives/which.es1.gz

new file mode 120000 (symlink)

index 0000000..1dc20a3
--- /dev/null
+++ b/alternatives/which.es1.gz
@@ -0,0 +1 @@
+/usr/share/man/es/man1/which.debianutils.1.gz
+\ No newline at end of file
diff --git a/alternatives/which.fr1.gz b/alternatives/which.fr1.gz

new file mode 120000 (symlink)

index 0000000..f337bdc
--- /dev/null
+++ b/alternatives/which.fr1.gz
@@ -0,0 +1 @@
+/usr/share/man/fr/man1/which.debianutils.1.gz
+\ No newline at end of file
diff --git a/alternatives/which.it1.gz b/alternatives/which.it1.gz

new file mode 120000 (symlink)

index 0000000..60fff86
--- /dev/null
+++ b/alternatives/which.it1.gz
@@ -0,0 +1 @@
+/usr/share/man/it/man1/which.debianutils.1.gz
+\ No newline at end of file
diff --git a/alternatives/which.ja1.gz b/alternatives/which.ja1.gz

new file mode 120000 (symlink)

index 0000000..b68b196
--- /dev/null
+++ b/alternatives/which.ja1.gz
@@ -0,0 +1 @@
+/usr/share/man/ja/man1/which.debianutils.1.gz
+\ No newline at end of file
diff --git a/alternatives/which.pl1.gz b/alternatives/which.pl1.gz

new file mode 120000 (symlink)

index 0000000..015af28
--- /dev/null
+++ b/alternatives/which.pl1.gz
@@ -0,0 +1 @@
+/usr/share/man/pl/man1/which.debianutils.1.gz
+\ No newline at end of file
diff --git a/alternatives/which.sl1.gz b/alternatives/which.sl1.gz

new file mode 120000 (symlink)

index 0000000..0586272
--- /dev/null
+++ b/alternatives/which.sl1.gz
@@ -0,0 +1 @@
+/usr/share/man/sl/man1/which.debianutils.1.gz
+\ No newline at end of file
diff --git a/alternatives/wx-config b/alternatives/wx-config

deleted file mode 120000 (symlink)

index 75151ea..0000000
--- a/alternatives/wx-config
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/x86_64-linux-gnu/wx/config/gtk3-unicode-3.0
-\ No newline at end of file
diff --git a/alternatives/xinput-ja_JP b/alternatives/xinput-ja_JP

deleted file mode 120000 (symlink)

index 4aa7a87..0000000
--- a/alternatives/xinput-ja_JP
+++ /dev/null
@@ -1 +0,0 @@
-/etc/X11/xinit/xinput.d/fcitx
-\ No newline at end of file
diff --git a/alternatives/xinput-ko_KR b/alternatives/xinput-ko_KR

deleted file mode 120000 (symlink)

index 4aa7a87..0000000
--- a/alternatives/xinput-ko_KR
+++ /dev/null
@@ -1 +0,0 @@
-/etc/X11/xinit/xinput.d/fcitx
-\ No newline at end of file
diff --git a/alternatives/xinput-zh_CN b/alternatives/xinput-zh_CN

deleted file mode 120000 (symlink)

index 4aa7a87..0000000
--- a/alternatives/xinput-zh_CN
+++ /dev/null
@@ -1 +0,0 @@
-/etc/X11/xinit/xinput.d/fcitx
-\ No newline at end of file
diff --git a/alternatives/xinput-zh_HK b/alternatives/xinput-zh_HK

deleted file mode 120000 (symlink)

index 4aa7a87..0000000
--- a/alternatives/xinput-zh_HK
+++ /dev/null
@@ -1 +0,0 @@
-/etc/X11/xinit/xinput.d/fcitx
-\ No newline at end of file
diff --git a/alternatives/xinput-zh_SG b/alternatives/xinput-zh_SG

deleted file mode 120000 (symlink)

index 4aa7a87..0000000
--- a/alternatives/xinput-zh_SG
+++ /dev/null
@@ -1 +0,0 @@
-/etc/X11/xinit/xinput.d/fcitx
-\ No newline at end of file
diff --git a/alternatives/xinput-zh_TW b/alternatives/xinput-zh_TW

deleted file mode 120000 (symlink)

index 4aa7a87..0000000
--- a/alternatives/xinput-zh_TW
+++ /dev/null
@@ -1 +0,0 @@
-/etc/X11/xinit/xinput.d/fcitx
-\ No newline at end of file
diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg

deleted file mode 100644 (file)

index 2728334..0000000
--- a/ansible/ansible.cfg
+++ /dev/null
@@ -1,490 +0,0 @@
-# config file for ansible -- https://ansible.com/
-# ===============================================
-
-# nearly all parameters can be overridden in ansible-playbook
-# or with command line flags. ansible will read ANSIBLE_CONFIG,
-# ansible.cfg in the current working directory, .ansible.cfg in
-# the home directory or /etc/ansible/ansible.cfg, whichever it
-# finds first
-
-[defaults]
-
-# some basic default values...
-
-#inventory      = /etc/ansible/hosts
-#library        = /usr/share/my_modules/
-#module_utils   = /usr/share/my_module_utils/
-#remote_tmp     = ~/.ansible/tmp
-#local_tmp      = ~/.ansible/tmp
-#plugin_filters_cfg = /etc/ansible/plugin_filters.yml
-#forks          = 5
-#poll_interval  = 15
-#sudo_user      = root
-#ask_sudo_pass = True
-#ask_pass      = True
-#transport      = smart
-#remote_port    = 22
-#module_lang    = C
-#module_set_locale = False
-
-# plays will gather facts by default, which contain information about
-# the remote system.
-#
-# smart - gather by default, but don't regather if already gathered
-# implicit - gather by default, turn off with gather_facts: False
-# explicit - do not gather by default, must say gather_facts: True
-#gathering = implicit
-
-# This only affects the gathering done by a play's gather_facts directive,
-# by default gathering retrieves all facts subsets
-# all - gather all subsets
-# network - gather min and network facts
-# hardware - gather hardware facts (longest facts to retrieve)
-# virtual - gather min and virtual facts
-# facter - import facts from facter
-# ohai - import facts from ohai
-# You can combine them using comma (ex: network,virtual)
-# You can negate them using ! (ex: !hardware,!facter,!ohai)
-# A minimal set of facts is always gathered.
-#gather_subset = all
-
-# some hardware related facts are collected
-# with a maximum timeout of 10 seconds. This
-# option lets you increase or decrease that
-# timeout to something more suitable for the
-# environment.
-# gather_timeout = 10
-
-# Ansible facts are available inside the ansible_facts.* dictionary
-# namespace. This setting maintains the behaviour which was the default prior
-# to 2.5, duplicating these variables into the main namespace, each with a
-# prefix of 'ansible_'.
-# This variable is set to True by default for backwards compatibility. It
-# will be changed to a default of 'False' in a future release.
-# ansible_facts.
-# inject_facts_as_vars = True
-
-# additional paths to search for roles in, colon separated
-#roles_path    = /etc/ansible/roles
-
-# uncomment this to disable SSH key host checking
-#host_key_checking = False
-
-# change the default callback, you can only have one 'stdout' type  enabled at a time.
-#stdout_callback = skippy
-
-
-## Ansible ships with some plugins that require whitelisting,
-## this is done to avoid running all of a type by default.
-## These setting lists those that you want enabled for your system.
-## Custom plugins should not need this unless plugin author specifies it.
-
-# enable callback plugins, they can output to stdout but cannot be 'stdout' type.
-#callback_whitelist = timer, mail
-
-# Determine whether includes in tasks and handlers are "static" by
-# default. As of 2.0, includes are dynamic by default. Setting these
-# values to True will make includes behave more like they did in the
-# 1.x versions.
-#task_includes_static = False
-#handler_includes_static = False
-
-# Controls if a missing handler for a notification event is an error or a warning
-#error_on_missing_handler = True
-
-# change this for alternative sudo implementations
-#sudo_exe = sudo
-
-# What flags to pass to sudo
-# WARNING: leaving out the defaults might create unexpected behaviours
-#sudo_flags = -H -S -n
-
-# SSH timeout
-#timeout = 10
-
-# default user to use for playbooks if user is not specified
-# (/usr/bin/ansible will use current user as default)
-#remote_user = root
-
-# logging is off by default unless this path is defined
-# if so defined, consider logrotate
-#log_path = /var/log/ansible.log
-
-# default module name for /usr/bin/ansible
-#module_name = command
-
-# use this shell for commands executed under sudo
-# you may need to change this to bin/bash in rare instances
-# if sudo is constrained
-#executable = /bin/sh
-
-# if inventory variables overlap, does the higher precedence one win
-# or are hash values merged together?  The default is 'replace' but
-# this can also be set to 'merge'.
-#hash_behaviour = replace
-
-# by default, variables from roles will be visible in the global variable
-# scope. To prevent this, the following option can be enabled, and only
-# tasks and handlers within the role will see the variables there
-#private_role_vars = yes
-
-# list any Jinja2 extensions to enable here:
-#jinja2_extensions = jinja2.ext.do,jinja2.ext.i18n
-
-# if set, always use this private key file for authentication, same as
-# if passing --private-key to ansible or ansible-playbook
-#private_key_file = /path/to/file
-
-# If set, configures the path to the Vault password file as an alternative to
-# specifying --vault-password-file on the command line.
-#vault_password_file = /path/to/vault_password_file
-
-# format of string {{ ansible_managed }} available within Jinja2
-# templates indicates to users editing templates files will be replaced.
-# replacing {file}, {host} and {uid} and strftime codes with proper values.
-#ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host}
-# {file}, {host}, {uid}, and the timestamp can all interfere with idempotence
-# in some situations so the default is a static string:
-#ansible_managed = Ansible managed
-
-# by default, ansible-playbook will display "Skipping [host]" if it determines a task
-# should not be run on a host.  Set this to "False" if you don't want to see these "Skipping"
-# messages. NOTE: the task header will still be shown regardless of whether or not the
-# task is skipped.
-#display_skipped_hosts = True
-
-# by default, if a task in a playbook does not include a name: field then
-# ansible-playbook will construct a header that includes the task's action but
-# not the task's args.  This is a security feature because ansible cannot know
-# if the *module* considers an argument to be no_log at the time that the
-# header is printed.  If your environment doesn't have a problem securing
-# stdout from ansible-playbook (or you have manually specified no_log in your
-# playbook on all of the tasks where you have secret information) then you can
-# safely set this to True to get more informative messages.
-#display_args_to_stdout = False
-
-# by default (as of 1.3), Ansible will raise errors when attempting to dereference
-# Jinja2 variables that are not set in templates or action lines. Uncomment this line
-# to revert the behavior to pre-1.3.
-#error_on_undefined_vars = False
-
-# by default (as of 1.6), Ansible may display warnings based on the configuration of the
-# system running ansible itself. This may include warnings about 3rd party packages or
-# other conditions that should be resolved if possible.
-# to disable these warnings, set the following value to False:
-#system_warnings = True
-
-# by default (as of 1.4), Ansible may display deprecation warnings for language
-# features that should no longer be used and will be removed in future versions.
-# to disable these warnings, set the following value to False:
-#deprecation_warnings = True
-
-# (as of 1.8), Ansible can optionally warn when usage of the shell and
-# command module appear to be simplified by using a default Ansible module
-# instead.  These warnings can be silenced by adjusting the following
-# setting or adding warn=yes or warn=no to the end of the command line
-# parameter string.  This will for example suggest using the git module
-# instead of shelling out to the git command.
-# command_warnings = False
-
-
-# set plugin path directories here, separate with colons
-#action_plugins     = /usr/share/ansible/plugins/action
-#become_plugins     = /usr/share/ansible/plugins/become
-#cache_plugins      = /usr/share/ansible/plugins/cache
-#callback_plugins   = /usr/share/ansible/plugins/callback
-#connection_plugins = /usr/share/ansible/plugins/connection
-#lookup_plugins     = /usr/share/ansible/plugins/lookup
-#inventory_plugins  = /usr/share/ansible/plugins/inventory
-#vars_plugins       = /usr/share/ansible/plugins/vars
-#filter_plugins     = /usr/share/ansible/plugins/filter
-#test_plugins       = /usr/share/ansible/plugins/test
-#terminal_plugins   = /usr/share/ansible/plugins/terminal
-#strategy_plugins   = /usr/share/ansible/plugins/strategy
-
-
-# by default, ansible will use the 'linear' strategy but you may want to try
-# another one
-#strategy = free
-
-# by default callbacks are not loaded for /bin/ansible, enable this if you
-# want, for example, a notification or logging callback to also apply to
-# /bin/ansible runs
-#bin_ansible_callbacks = False
-
-
-# don't like cows?  that's unfortunate.
-# set to 1 if you don't want cowsay support or export ANSIBLE_NOCOWS=1
-#nocows = 1
-
-# set which cowsay stencil you'd like to use by default. When set to 'random',
-# a random stencil will be selected for each task. The selection will be filtered
-# against the `cow_whitelist` option below.
-#cow_selection = default
-#cow_selection = random
-
-# when using the 'random' option for cowsay, stencils will be restricted to this list.
-# it should be formatted as a comma-separated list with no spaces between names.
-# NOTE: line continuations here are for formatting purposes only, as the INI parser
-#       in python does not support them.
-#cow_whitelist=bud-frogs,bunny,cheese,daemon,default,dragon,elephant-in-snake,elephant,eyes,\
-#              hellokitty,kitty,luke-koala,meow,milk,moofasa,moose,ren,sheep,small,stegosaurus,\
-#              stimpy,supermilker,three-eyes,turkey,turtle,tux,udder,vader-koala,vader,www
-
-# don't like colors either?
-# set to 1 if you don't want colors, or export ANSIBLE_NOCOLOR=1
-#nocolor = 1
-
-# if set to a persistent type (not 'memory', for example 'redis') fact values
-# from previous runs in Ansible will be stored.  This may be useful when
-# wanting to use, for example, IP information from one group of servers
-# without having to talk to them in the same playbook run to get their
-# current IP information.
-#fact_caching = memory
-
-#This option tells Ansible where to cache facts. The value is plugin dependent.
-#For the jsonfile plugin, it should be a path to a local directory.
-#For the redis plugin, the value is a host:port:database triplet: fact_caching_connection = localhost:6379:0
-
-#fact_caching_connection=/tmp
-
-
-
-# retry files
-# When a playbook fails a .retry file can be created that will be placed in ~/
-# You can enable this feature by setting retry_files_enabled to True
-# and you can change the location of the files by setting retry_files_save_path
-
-#retry_files_enabled = False
-#retry_files_save_path = ~/.ansible-retry
-
-# squash actions
-# Ansible can optimise actions that call modules with list parameters
-# when looping. Instead of calling the module once per with_ item, the
-# module is called once with all items at once. Currently this only works
-# under limited circumstances, and only with parameters named 'name'.
-#squash_actions = apk,apt,dnf,homebrew,pacman,pkgng,yum,zypper
-
-# prevents logging of task data, off by default
-#no_log = False
-
-# prevents logging of tasks, but only on the targets, data is still logged on the master/controller
-#no_target_syslog = False
-
-# controls whether Ansible will raise an error or warning if a task has no
-# choice but to create world readable temporary files to execute a module on
-# the remote machine.  This option is False by default for security.  Users may
-# turn this on to have behaviour more like Ansible prior to 2.1.x.  See
-# https://docs.ansible.com/ansible/become.html#becoming-an-unprivileged-user
-# for more secure ways to fix this than enabling this option.
-#allow_world_readable_tmpfiles = False
-
-# controls the compression level of variables sent to
-# worker processes. At the default of 0, no compression
-# is used. This value must be an integer from 0 to 9.
-#var_compression_level = 9
-
-# controls what compression method is used for new-style ansible modules when
-# they are sent to the remote system.  The compression types depend on having
-# support compiled into both the controller's python and the client's python.
-# The names should match with the python Zipfile compression types:
-# * ZIP_STORED (no compression. available everywhere)
-# * ZIP_DEFLATED (uses zlib, the default)
-# These values may be set per host via the ansible_module_compression inventory
-# variable
-#module_compression = 'ZIP_DEFLATED'
-
-# This controls the cutoff point (in bytes) on --diff for files
-# set to 0 for unlimited (RAM may suffer!).
-#max_diff_size = 1048576
-
-# This controls how ansible handles multiple --tags and --skip-tags arguments
-# on the CLI.  If this is True then multiple arguments are merged together.  If
-# it is False, then the last specified argument is used and the others are ignored.
-# This option will be removed in 2.8.
-#merge_multiple_cli_flags = True
-
-# Controls showing custom stats at the end, off by default
-#show_custom_stats = True
-
-# Controls which files to ignore when using a directory as inventory with
-# possibly multiple sources (both static and dynamic)
-#inventory_ignore_extensions = ~, .orig, .bak, .ini, .cfg, .retry, .pyc, .pyo
-
-# This family of modules use an alternative execution path optimized for network appliances
-# only update this setting if you know how this works, otherwise it can break module execution
-#network_group_modules=eos, nxos, ios, iosxr, junos, vyos
-
-# When enabled, this option allows lookups (via variables like {{lookup('foo')}} or when used as
-# a loop with `with_foo`) to return data that is not marked "unsafe". This means the data may contain
-# jinja2 templating language which will be run through the templating engine.
-# ENABLING THIS COULD BE A SECURITY RISK
-#allow_unsafe_lookups = False
-
-# set default errors for all plays
-#any_errors_fatal = False
-
-[inventory]
-# enable inventory plugins, default: 'host_list', 'script', 'auto', 'yaml', 'ini', 'toml'
-#enable_plugins = host_list, virtualbox, yaml, constructed
-
-# ignore these extensions when parsing a directory as inventory source
-#ignore_extensions = .pyc, .pyo, .swp, .bak, ~, .rpm, .md, .txt, ~, .orig, .ini, .cfg, .retry
-
-# ignore files matching these patterns when parsing a directory as inventory source
-#ignore_patterns=
-
-# If 'true' unparsed inventory sources become fatal errors, they are warnings otherwise.
-#unparsed_is_failed=False
-
-[privilege_escalation]
-#become=True
-#become_method=sudo
-#become_user=root
-#become_ask_pass=False
-
-[paramiko_connection]
-
-# uncomment this line to cause the paramiko connection plugin to not record new host
-# keys encountered.  Increases performance on new host additions.  Setting works independently of the
-# host key checking setting above.
-#record_host_keys=False
-
-# by default, Ansible requests a pseudo-terminal for commands executed under sudo. Uncomment this
-# line to disable this behaviour.
-#pty=False
-
-# paramiko will default to looking for SSH keys initially when trying to
-# authenticate to remote devices.  This is a problem for some network devices
-# that close the connection after a key failure.  Uncomment this line to
-# disable the Paramiko look for keys function
-#look_for_keys = False
-
-# When using persistent connections with Paramiko, the connection runs in a
-# background process.  If the host doesn't already have a valid SSH key, by
-# default Ansible will prompt to add the host key.  This will cause connections
-# running in background processes to fail.  Uncomment this line to have
-# Paramiko automatically add host keys.
-#host_key_auto_add = True
-
-[ssh_connection]
-
-# ssh arguments to use
-# Leaving off ControlPersist will result in poor performance, so use
-# paramiko on older platforms rather than removing it, -C controls compression use
-#ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s
-
-# The base directory for the ControlPath sockets.
-# This is the "%(directory)s" in the control_path option
-#
-# Example:
-# control_path_dir = /tmp/.ansible/cp
-#control_path_dir = ~/.ansible/cp
-
-# The path to use for the ControlPath sockets. This defaults to a hashed string of the hostname,
-# port and username (empty string in the config). The hash mitigates a common problem users
-# found with long hostnames and the conventional %(directory)s/ansible-ssh-%%h-%%p-%%r format.
-# In those cases, a "too long for Unix domain socket" ssh error would occur.
-#
-# Example:
-# control_path = %(directory)s/%%h-%%r
-#control_path =
-
-# Enabling pipelining reduces the number of SSH operations required to
-# execute a module on the remote server. This can result in a significant
-# performance improvement when enabled, however when using "sudo:" you must
-# first disable 'requiretty' in /etc/sudoers
-#
-# By default, this option is disabled to preserve compatibility with
-# sudoers configurations that have requiretty (the default on many distros).
-#
-#pipelining = False
-
-# Control the mechanism for transferring files (old)
-#   * smart = try sftp and then try scp [default]
-#   * True = use scp only
-#   * False = use sftp only
-#scp_if_ssh = smart
-
-# Control the mechanism for transferring files (new)
-# If set, this will override the scp_if_ssh option
-#   * sftp  = use sftp to transfer files
-#   * scp   = use scp to transfer files
-#   * piped = use 'dd' over SSH to transfer files
-#   * smart = try sftp, scp, and piped, in that order [default]
-#transfer_method = smart
-
-# if False, sftp will not use batch mode to transfer files. This may cause some
-# types of file transfer failures impossible to catch however, and should
-# only be disabled if your sftp version has problems with batch mode
-#sftp_batch_mode = False
-
-# The -tt argument is passed to ssh when pipelining is not enabled because sudo 
-# requires a tty by default. 
-#usetty = True
-
-# Number of times to retry an SSH connection to a host, in case of UNREACHABLE.
-# For each retry attempt, there is an exponential backoff,
-# so after the first attempt there is 1s wait, then 2s, 4s etc. up to 30s (max).
-#retries = 3
-
-[persistent_connection]
-
-# Configures the persistent connection timeout value in seconds.  This value is
-# how long the persistent connection will remain idle before it is destroyed.
-# If the connection doesn't receive a request before the timeout value
-# expires, the connection is shutdown. The default value is 30 seconds.
-#connect_timeout = 30
-
-# The command timeout value defines the amount of time to wait for a command
-# or RPC call before timing out. The value for the command timeout must
-# be less than the value of the persistent connection idle timeout (connect_timeout)
-# The default value is 30 second.
-#command_timeout = 30
-
-[accelerate]
-#accelerate_port = 5099
-#accelerate_timeout = 30
-#accelerate_connect_timeout = 5.0
-
-# The daemon timeout is measured in minutes. This time is measured
-# from the last activity to the accelerate daemon.
-#accelerate_daemon_timeout = 30
-
-# If set to yes, accelerate_multi_key will allow multiple
-# private keys to be uploaded to it, though each user must
-# have access to the system via SSH to add a new key. The default
-# is "no".
-#accelerate_multi_key = yes
-
-[selinux]
-# file systems that require special treatment when dealing with security context
-# the default behaviour that copies the existing context or uses the user default
-# needs to be changed to use the file system dependent context.
-#special_context_filesystems=nfs,vboxsf,fuse,ramfs,9p,vfat
-
-# Set this to yes to allow libvirt_lxc connections to work without SELinux.
-#libvirt_lxc_noseclabel = yes
-
-[colors]
-#highlight = white
-#verbose = blue
-#warn = bright purple
-#error = red
-#debug = dark gray
-#deprecate = purple
-#skip = cyan
-#unreachable = red
-#ok = green
-#changed = yellow
-#diff_add = green
-#diff_remove = red
-#diff_lines = cyan
-
-
-[diff]
-# Always print diff when running ( same as always running with -D/--diff )
-# always = no
-
-# Set how many context lines to show in diff
-# context = 3
diff --git a/ansible/hosts b/ansible/hosts

deleted file mode 100644 (file)

index 681bbb8..0000000
--- a/ansible/hosts
+++ /dev/null
@@ -1,44 +0,0 @@
-# This is the default ansible 'hosts' file.
-#
-# It should live in /etc/ansible/hosts
-#
-#   - Comments begin with the '#' character
-#   - Blank lines are ignored
-#   - Groups of hosts are delimited by [header] elements
-#   - You can enter hostnames or ip addresses
-#   - A hostname/ip can be a member of multiple groups
-
-# Ex 1: Ungrouped hosts, specify before any group headers.
-
-#green.example.com
-#blue.example.com
-#192.168.100.1
-#192.168.100.10
-
-# Ex 2: A collection of hosts belonging to the 'webservers' group
-
-#[webservers]
-#alpha.example.org
-#beta.example.org
-#192.168.1.100
-#192.168.1.110
-
-# If you have multiple hosts following a pattern you can specify
-# them like this:
-
-#www[001:006].example.com
-
-# Ex 3: A collection of database servers in the 'dbservers' group
-
-#[dbservers]
-#
-#db01.intranet.mydomain.net
-#db02.intranet.mydomain.net
-#10.25.1.56
-#10.25.1.57
-
-# Here's another example of host ranges, this time there are no
-# leading 0s:
-
-#db-[99:101]-node.example.com
-
diff --git a/apparmor.d/usr.sbin.tcpdump b/apparmor.d/usr.sbin.tcpdump

deleted file mode 100644 (file)

index d0a7037..0000000
--- a/apparmor.d/usr.sbin.tcpdump
+++ /dev/null
@@ -1,65 +0,0 @@
-# vim:syntax=apparmor
-#include <tunables/global>
-
-/usr/sbin/tcpdump {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/user-tmp>
-
-  capability net_raw,
-  capability setuid,
-  capability setgid,
-  capability dac_override,
-  capability chown,
-  network raw,
-  network packet,
-
-  # for -D
-  @{PROC}/bus/usb/ r,
-  @{PROC}/bus/usb/** r,
-
-  # for finding an interface
-  /dev/ r,
-  @{PROC}/[0-9]*/net/dev r,
-  /sys/bus/usb/devices/ r,
-  /sys/class/net/ r,
-  /sys/devices/**/net/** r,
-
-  # for -j
-  capability net_admin,
-
-  # for tracing USB bus, which libpcap supports
-  /dev/usbmon* r,
-  /dev/bus/usb/ r,
-  /dev/bus/usb/** r,
-
-  # for init_etherarray(), with -e
-  /etc/ethers r,
-
-  # for USB probing (see libpcap-1.1.x/pcap-usb-linux.c:probe_devices())
-  /dev/bus/usb/**/[0-9]* w,
-
-  # for -z
-  /{usr/,}bin/gzip ixr,
-  /{usr/,}bin/bzip2 ixr,
-
-  # for -F and -w
-  audit deny @{HOME}/.* mrwkl,
-  audit deny @{HOME}/.*/ rw,
-  audit deny @{HOME}/.*/** mrwkl,
-  audit deny @{HOME}/bin/ rw,
-  audit deny @{HOME}/bin/** mrwkl,
-  owner @{HOME}/ r,
-  owner @{HOME}/** rw,
-
-  # for -r, -F and -w
-  /**.[pP][cC][aA][pP] rw,
-
-  # for convenience with -r (ie, read pcap files from other sources)
-  /var/log/snort/*log* r,
-
-  /usr/sbin/tcpdump mr,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.sbin.tcpdump>
-}
diff --git a/apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg b/apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg

deleted file mode 100644 (file)

index 7752314..0000000

Binary files a/apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg and /dev/null differ
diff --git a/cron.daily/apt-compat b/cron.daily/apt-compat

index b0b5537680ece022b8d420f6a92b8fc20513bbac..bde3237f699514355d053a98e7d9aecd582e4608 100755 (executable)
--- a/cron.daily/apt-compat
+++ b/cron.daily/apt-compat
@@ -18,7 +18,7 @@ check_power()
      #       1 (false)   System is not on main power
      #       255 (false) Power status could not be determined
      # Desktop systems always return 255 it seems
-    if which on_ac_power >/dev/null 2>&1; then
+    if command -v on_ac_power >/dev/null; then
          if on_ac_power; then
              :
          elif [ $? -eq 1 ]; then
diff --git a/cron.daily/bsdmainutils b/cron.daily/bsdmainutils

deleted file mode 100755 (executable)

index e65cbd3..0000000
--- a/cron.daily/bsdmainutils
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# /etc/cron.daily/calendar: BSD mainutils calendar daily maintenance script
-# Written by Austin Donnelly <and1000@debian.org>
-
-. /etc/default/bsdmainutils
-
-[ x$RUN_DAILY = xtrue ] || exit 0
-
-[ -x /usr/sbin/sendmail ] || exit 0
-
-if [ ! -x /usr/bin/cpp ]; then
-  echo "The cpp package is needed to run calendar."
-  exit 1
-fi
-
-/usr/bin/calendar -a
diff --git a/cron.daily/dpkg b/cron.daily/dpkg

index 62da81727422799b38db793040860924bfa4b2a6..899572d722cb1f8e3c542b2f175c7d6ced736877 100755 (executable)
--- a/cron.daily/dpkg
+++ b/cron.daily/dpkg
@@ -1,36 +1,8 @@
  #!/bin/sh
  
-dbdir=/var/lib/dpkg
-
-# Backup the 7 last versions of dpkg databases containing user data.
-if cd /var/backups ; then
-    # We backup all relevant database files if any has changed, so that
-    # the rotation number always contains an internally consistent set.
-    dbchanged=no
-    dbfiles="arch status diversions statoverride"
-    for db in $dbfiles ; do
-        if ! cmp -s "dpkg.${db}.0" "$dbdir/$db"; then
-            dbchanged=yes
-            break;
-        fi
-    done
-    if [ "$dbchanged" = "yes" ] ; then
-        for db in $dbfiles ; do
-            [ -e "$dbdir/$db" ] || continue
-            cp -p "$dbdir/$db" "dpkg.$db"
-            savelog -c 7 "dpkg.$db" >/dev/null
-        done
-    fi
-
-    # The alternatives database is independent from the dpkg database.
-    dbalt=alternatives
-
-    # XXX: Ideally we'd use --warning=none instead of discarding stderr, but
-    # as of GNU tar 1.27.1, it does not seem to work reliably (see #749307).
-    if ! test -e ${dbalt}.tar.0 ||
-       ! tar -df ${dbalt}.tar.0 -C $dbdir $dbalt >/dev/null 2>&1 ;
-    then
-        tar -cf ${dbalt}.tar -C $dbdir $dbalt >/dev/null 2>&1
-        savelog -c 7 ${dbalt}.tar >/dev/null
-    fi
+# Skip if systemd is running.
+if [ -d /run/systemd/system ]; then
+  exit 0
  fi
+
+/usr/libexec/dpkg/dpkg-db-backup
diff --git a/cron.daily/mlocate b/cron.daily/mlocate

deleted file mode 100755 (executable)

index bc69541..0000000
--- a/cron.daily/mlocate
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/bash
-
-set -e
-
-[ -x /usr/bin/updatedb.mlocate ] || exit 0
-
-if which on_ac_power >/dev/null 2>&1; then
-    ON_BATTERY=0
-    on_ac_power >/dev/null 2>&1 || ON_BATTERY=$?
-    if [ "$ON_BATTERY" -eq 1 ]; then
-       exit 0
-    fi
-fi
-
-# See ionice(1)
-if [ -x /usr/bin/ionice ] &&
-    /usr/bin/ionice -c3 true 2>/dev/null; then
-    IONICE="/usr/bin/ionice -c3"
-fi
-
-# See nocache(1)
-NOCACHE=
-if [ -x /usr/bin/nocache ]; then
-    NOCACHE="/usr/bin/nocache"
-fi
-
-flock --nonblock /run/mlocate.daily.lock $NOCACHE $IONICE nice /usr/bin/updatedb.mlocate
diff --git a/cron.daily/update-notifier-common b/cron.daily/update-notifier-common

deleted file mode 100755 (executable)

index e90d153..0000000
--- a/cron.daily/update-notifier-common
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-[ -x /usr/lib/update-notifier/package-data-downloader ] || exit 0
-
-# Try to rerun any package data downloads that failed at package install time.
-/usr/lib/update-notifier/package-data-downloader
diff --git a/cron.weekly/update-notifier-common b/cron.weekly/update-notifier-common

deleted file mode 100755 (executable)

index 0e87107..0000000
--- a/cron.weekly/update-notifier-common
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-[ -x /usr/lib/ubuntu-release-upgrader/release-upgrade-motd ] || exit 0
-
-sleep_then_check() {
-    # Sleep for up to an hour to spread the load of checking for updates on
-    # the Ubuntu infrastructure
-    sleep $(shuf -i 1-3600 -n 1)
-    # Check to see whether there is a new version of Ubuntu available
-    /usr/lib/ubuntu-release-upgrader/release-upgrade-motd
-}
-
-sleep_then_check &
diff --git a/dbus-1/system.d/org.freedesktop.Accounts.conf b/dbus-1/system.d/org.freedesktop.Accounts.conf

deleted file mode 100644 (file)

index 95fc616..0000000
--- a/dbus-1/system.d/org.freedesktop.Accounts.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- Only root can own the service -->
-  <policy user="root">
-    <allow own="org.freedesktop.Accounts"/>
-  </policy>
-
-  <policy context="default">
-    <allow send_destination="org.freedesktop.Accounts"/>
-    <allow send_destination="org.freedesktop.Accounts"
-           send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.freedesktop.Accounts"
-           send_interface="org.freedesktop.DBus.Introspectable"/>
-    <allow send_destination="org.freedesktop.Accounts.User"
-           send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.freedesktop.Accounts.User"
-           send_interface="org.freedesktop.DBus.Introspectable"/>
-  </policy>
-
-</busconfig>
diff --git a/debian_version b/debian_version

index 37ad99eb8c628a0619df3d30e96fd529e28d9767..a82f56a418c03a9cd7f8463a4538aebdb025107d 100644 (file)
--- a/debian_version
+++ b/debian_version
@@ -1 +1 @@
-bullseye/sid
+bookworm/sid
diff --git a/default/bsdmainutils b/default/bsdmainutils

deleted file mode 100644 (file)

index e4ac054..0000000
--- a/default/bsdmainutils
+++ /dev/null
@@ -1,4 +0,0 @@
-# Uncomment the following line if you'd like all of your users'
-# ~/calendar files to be checked daily.  Calendar will send them mail
-# to remind them of upcoming events.  See calendar(1) for more details.
-#RUN_DAILY=true
diff --git a/dhcp/dhclient-enter-hooks.d/resolved b/dhcp/dhclient-enter-hooks.d/resolved

deleted file mode 100755 (executable)

index 870ea76..0000000
--- a/dhcp/dhclient-enter-hooks.d/resolved
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# Script fragment to make dhclient supply nameserver information to resolvconf
-#
-
-# Tips:
-# * Be careful about changing the environment since this is sourced
-# * This script fragment uses bash features
-# * As of isc-dhcp-client 4.2 the "reason" (for running the script) can be one of the following.
-#   (Listed on man page:) MEDIUM(0) PREINIT(0)  BOUND(M)  RENEW(M)  REBIND(M)  REBOOT(M)         EXPIRE(D)  FAIL(D) RELEASE(D)  STOP(D) NBI(-) TIMEOUT(M)
-#   (Also used in master script:)                                                                                                                         ARPCHECK(0), ARPSEND(0)
-#   (Also used in master script:)   PREINIT6(0) BOUND6(M) RENEW6(M) REBIND6(M)        DEPREF6(0) EXPIRE6(D)         RELEASE6(D) STOP6(D)
-#   (0) = master script does not run make_resolv_conf
-#   (M) = master script runs make_resolv_conf
-#   (D) = master script downs interface
-#   (-) = master script does nothing with this
-
-if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then
-        # For safety, first undefine the nasty default make_resolv_conf()
-        make_resolv_conf() { : ; }
-        case "$reason" in
-          BOUND|RENEW|REBIND|REBOOT|TIMEOUT|BOUND6|RENEW6|REBIND6)
-                # Define a resolvconf-compatible m_r_c() function
-                # It gets run later (or, in the TIMEOUT case, MAY get run later)
-          make_resolv_conf() {
-              local statedir
-              if [ ! "$interface" ] ; then
-                  return
-              fi
-              statedir="/run/systemd/resolved.conf.d"
-              mkdir -p $statedir
-
-              oldstate="$(mktemp)"
-              md5sum $statedir/isc-dhcp-v4-$interface.conf $statedir/isc-dhcp-v6-$interface.conf > $oldstate 2> /dev/null
-              if [ -n "$new_domain_name_servers" ] ; then
-                  cat <<EOF >$statedir/isc-dhcp-v4-$interface.conf
-[Resolve]
-DNS=$new_domain_name_servers
-EOF
-                  if [ -n "$new_domain_name" ] || [ -n "$new_domain_search" ] ; then
-                      cat <<EOF >>$statedir/isc-dhcp-v4-$interface.conf
-Domains=$new_domain_search $new_domain_name
-EOF
-                  fi
-              fi
-              if [ -n "$new_dhcp6_name_servers" ] ; then
-                  cat <<EOF >$statedir/isc-dhcp-v6-$interface.conf
-[Resolve]
-DNS=$new_dhcp6_name_servers
-EOF
-                  if [ -n "$new_dhcp6_domain_search" ] ; then
-                      cat <<EOF >>$statedir/isc-dhcp-v6-$interface.conf
-Domains=$new_dhcp6_domain_search
-EOF
-                  fi
-              fi
-
-              newstate="$(mktemp)"
-              md5sum $statedir/isc-dhcp-v4-$interface.conf $statedir/isc-dhcp-v6-$interface.conf > $newstate 2> /dev/null
-              if ! cmp --quiet $oldstate $newstate; then
-                  # We need to reset-failed to reset the start limit counter,
-                  # in case we're processing more than StartLimitBurst interfaces
-                  # LP: #1939255
-                  systemctl reset-failed systemd-resolved.service
-                  systemctl try-reload-or-restart systemd-resolved.service
-              fi
-
-              rm $oldstate
-              rm $newstate
-          }
-                ;;
-
-          EXPIRE|FAIL|RELEASE|STOP)
-              if [ ! "$interface" ] ; then
-                  return
-              fi
-              rm -f /run/systemd/resolved.conf.d/isc-dhcp-v4-$interface.conf
-              systemctl try-reload-or-restart systemd-resolved.service
-              ;;
-          EXPIRE6|RELEASE6|STOP6)
-              if [ ! "$interface" ] ; then
-                  return
-              fi
-              rm -f /run/systemd/resolved.conf.d/isc-dhcp-v6-$interface.conf
-              systemctl try-reload-or-restart systemd-resolved.service
-              ;;
-        esac
-fi
diff --git a/dpkg/origins/debian b/dpkg/origins/debian

index 91f6ed1d9d37abeab59d6f5a60f5bbea7f33324d..3b623d25cd0e52d74520a54adbca02f71f29574c 100644 (file)
--- a/dpkg/origins/debian
+++ b/dpkg/origins/debian
@@ -1,3 +1,3 @@
  Vendor: Debian
-Vendor-URL: http://www.debian.org/
+Vendor-URL: https://www.debian.org/
  Bugs: debbugs://bugs.debian.org
diff --git a/fonts/conf.avail/30-metric-aliases.conf b/fonts/conf.avail/30-metric-aliases.conf

index 147fde6b1c6ac48eed22a2a8bf47593f8e0a77e9..7ce907cb516cd02c2e8f527a4f0faa1efdaa6eea 100644 (file)
--- a/fonts/conf.avail/30-metric-aliases.conf
+++ b/fonts/conf.avail/30-metric-aliases.conf
@@ -527,6 +527,13 @@ NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
           </accept>
         </alias>
  
+       <alias binding="same">
+         <family>CourierStd</family>
+         <accept>
+         <family>Courier</family>
+         </accept>
+       </alias>
+
         <alias binding="same">
           <family>ITC Avant Garde Gothic</family>
           <accept>
diff --git a/fonts/conf.avail/45-latin.conf b/fonts/conf.avail/45-latin.conf

index a9240b94353cdfe5bc28a8a596488d313dd9542f..724a468c0933a3294d801986ca2170e034bd7356 100644 (file)
--- a/fonts/conf.avail/45-latin.conf
+++ b/fonts/conf.avail/45-latin.conf
@@ -196,6 +196,10 @@
                 <family>Courier</family>
                 <default><family>monospace</family></default>
         </alias>
+       <alias>
+               <family>CourierStd</family>
+               <default><family>monospace</family></default>
+       </alias>
         <alias>
                 <family>Cumberland AMT</family>
                 <default><family>monospace</family></default>
diff --git a/fonts/conf.avail/57-dejavu-sans-mono.conf b/fonts/conf.avail/57-dejavu-sans-mono.conf

index cc42561e3826d58aef8b06b352d01b766eb2fb13..2c75b5cff6e206fae08d6ec0279337b12f98bc4e 100644 (file)
--- a/fonts/conf.avail/57-dejavu-sans-mono.conf
+++ b/fonts/conf.avail/57-dejavu-sans-mono.conf
@@ -45,18 +45,4 @@
        <family>DejaVu Sans Mono</family>
      </accept>
    </alias>
-  <!-- Generic name assignment -->
-  <alias>
-    <family>DejaVu Sans Mono</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>DejaVu Sans Mono</family>
-    </prefer>
-  </alias>
  </fontconfig>
diff --git a/fonts/conf.avail/57-dejavu-sans.conf b/fonts/conf.avail/57-dejavu-sans.conf

index 565cab5fc501be545d187c7bed7794aea89de746..cff7a842d0ce043b84c5da90f942aed4d61c173c 100644 (file)
--- a/fonts/conf.avail/57-dejavu-sans.conf
+++ b/fonts/conf.avail/57-dejavu-sans.conf
@@ -70,18 +70,4 @@
        <family>DejaVu Sans</family>
      </accept>
    </alias>
-  <!-- Generic name assignment -->
-  <alias>
-    <family>DejaVu Sans</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>DejaVu Sans</family>
-    </prefer>
-  </alias>
  </fontconfig>
diff --git a/fonts/conf.avail/57-dejavu-serif.conf b/fonts/conf.avail/57-dejavu-serif.conf

index a922e9b2dca120d5267bfe5b71bac78a95adc0bf..10ae70fd21618e0124fcaaa92667898af0874197 100644 (file)
--- a/fonts/conf.avail/57-dejavu-serif.conf
+++ b/fonts/conf.avail/57-dejavu-serif.conf
@@ -52,18 +52,4 @@
        <family>DejaVu Serif</family>
      </accept>
    </alias>
-  <!-- Generic name assignment -->
-  <alias>
-    <family>DejaVu Serif</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-  <!-- Generic name aliasing -->
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>DejaVu Serif</family>
-    </prefer>
-  </alias>
  </fontconfig>
diff --git a/fuse.conf b/fuse.conf

index ae194a07105be3818d7e0fab40baf825477de861..3c9b6ac9877fd179bfc0e83bafd071efaeb6388f 100644 (file)
--- a/fuse.conf
+++ b/fuse.conf
@@ -1,8 +1,17 @@
-# /etc/fuse.conf - Configuration file for Filesystem in Userspace (FUSE)
+# The file /etc/fuse.conf allows for the following parameters:
+#
+# user_allow_other - Using the allow_other mount option works fine as root, in
+# order to have it work as user you need user_allow_other in /etc/fuse.conf as
+# well. (This option allows users to use the allow_other option.) You need
+# allow_other if you want users other than the owner to access a mounted fuse.
+# This option must appear on a line by itself. There is no value, just the
+# presence of the option.
  
-# Set the maximum number of FUSE mounts allowed to non-root users.
-# The default is 1000.
-#mount_max = 1000
-
-# Allow non-root users to specify the allow_other or allow_root mount options.
  #user_allow_other
+
+
+# mount_max = n - this option sets the maximum number of mounts.
+# Currently (2014) it must be typed exactly as shown
+# (with a single space before and after the equals sign).
+
+#mount_max = 1000
diff --git a/group.org b/group.org

new file mode 100644 (file)

index 0000000..e614c9c
--- /dev/null
+++ b/group.org
@@ -0,0 +1,96 @@
+root:x:0:
+daemon:x:1:
+bin:x:2:
+sys:x:3:
+adm:x:4:syslog,frank
+tty:x:5:frank,syslog
+disk:x:6:
+lp:x:7:frank
+mail:x:8:
+news:x:9:
+uucp:x:10:
+man:x:12:
+proxy:x:13:
+kmem:x:15:
+dialout:x:20:frank
+fax:x:21:frank
+voice:x:22:
+cdrom:x:24:frank
+floppy:x:25:frank
+tape:x:26:frank
+sudo:x:27:frank
+audio:x:29:pulse,frank
+dip:x:30:frank
+www-data:x:33:
+backup:x:34:
+operator:x:37:
+list:x:38:
+irc:x:39:
+src:x:40:
+gnats:x:41:
+shadow:x:42:
+utmp:x:43:
+video:x:44:plex,frank
+sasl:x:45:
+plugdev:x:46:frank
+staff:x:50:
+games:x:60:frank
+users:x:100:
+nogroup:x:65534:
+systemd-journal:x:101:
+systemd-network:x:102:
+systemd-resolve:x:103:
+input:x:104:
+crontab:x:105:frank
+syslog:x:106:
+messagebus:x:107:
+netdev:x:108:
+mlocate:x:109:frank
+ssl-cert:x:110:
+uuidd:x:111:
+lpadmin:x:112:frank
+rtkit:x:113:
+avahi-autoipd:x:114:
+ssh:x:115:
+bluetooth:x:116:
+systemd-coredump:x:117:
+lightdm:x:119:
+nopasswdlogin:x:120:
+scanner:x:121:saned,frank
+saned:x:122:
+nm-openvpn:x:123:
+avahi:x:124:
+colord:x:125:
+pulse:x:126:
+pulse-access:x:127:
+geoclue:x:128:
+sambashare:x:129:frank
+bind:x:130:
+postfix:x:131:
+postdrop:x:132:
+plex:x:963:frank
+kvm:x:133:
+rdma:x:134:
+_chrony:x:135:
+gdm:x:118:
+libvirt:x:136:frank
+libvirt-qemu:x:64055:libvirt-qemu
+libvirt-dnsmasq:x:137:
+mysql:x:138:
+winbindd_priv:x:139:
+stapdev:x:140:
+stapusr:x:141:
+stapsys:x:142:
+wireshark:x:143:
+ulog:x:144:
+vde2-net:x:145:
+nobody:x:1000:
+gast:x:1126:
+docker:x:146:frank
+tcpdump:x:147:
+render:x:148:
+tss:x:149:
+_flatpak:x:150:
+systemd-timesync:x:999:
+sambamachines:x:1127:
+xpra:x:151:
diff --git a/init.d/hwclock.sh b/init.d/hwclock.sh

index 208ca2d5a4b427f49b91587041e8dade4f6f07ce..a9872b641d9b8bcfce9a04b06d930c7aa5f0fe0c 100755 (executable)
--- a/init.d/hwclock.sh
+++ b/init.d/hwclock.sh
@@ -1,43 +1,27 @@
  #!/bin/sh
-# hwclock.sh   Set and adjust the CMOS clock.
-#
-# Version:     @(#)hwclock.sh  2.00  14-Dec-1998  miquels@cistron.nl
-#
-# Patches:
-#              2000-01-30 Henrique M. Holschuh <hmh@rcm.org.br>
-#               - Minor cosmetic changes in an attempt to help new
-#                 users notice something IS changing their clocks
-#                 during startup/shutdown.
-#               - Added comments to alert users of hwclock issues
-#                 and discourage tampering without proper doc reading.
-#               2012-02-16 Roger Leigh <rleigh@debian.org>
-#                - Use the UTC/LOCAL setting in /etc/adjtime rather than
-#                  the UTC setting in /etc/default/rcS.  Additionally
-#                  source /etc/default/hwclock to permit configuration.
  
  ### BEGIN INIT INFO
  # Provides:          hwclock
-# Required-Start:    mountdevsubfs
+# Required-Start:
  # Required-Stop:     mountdevsubfs
  # Should-Stop:       umountfs
  # Default-Start:     S
-# X-Start-Before:    checkroot
  # Default-Stop:      0 6
-# Short-Description: Sync hardware and system clock time.
+# Short-Description: Save system clock to hardware on shutdown.
  ### END INIT INFO
  
-# These defaults are user-overridable in /etc/default/hwclock
-BADYEAR=no
-HWCLOCKACCESS=yes
-HWCLOCKPARS=
-HCTOSYS_DEVICE=rtc0
+# Note: this init script and related code is only useful if you
+# run a sysvinit system, without NTP synchronization.
+
+if [ -e /run/systemd/system ] ; then
+    exit 0
+fi
  
-# We only want to use the system timezone or else we'll get
-# potential inconsistency at startup.
  unset TZ
  
  hwclocksh()
  {
+    HCTOSYS_DEVICE=rtc0
      [ ! -x /sbin/hwclock ] && return 0
      [ ! -r /etc/default/rcS ] || . /etc/default/rcS
      [ ! -r /etc/default/hwclock ] || . /etc/default/hwclock
@@ -45,75 +29,28 @@ hwclocksh()
      . /lib/lsb/init-functions
      verbose_log_action_msg() { [ "$VERBOSE" = no ] || log_action_msg "$@"; }
  
-    case "$BADYEAR" in
-       no|"")  BADYEAR="" ;;
-       yes)    BADYEAR="--badyear" ;;
-       *)      log_action_msg "unknown BADYEAR setting: \"$BADYEAR\""; return 1 ;;
-    esac
-
      case "$1" in
-       start)
-           # If the admin deleted the hwclock config, create a blank
-           # template with the defaults.
-           if [ -w /etc ] && [ ! -f /etc/adjtime ] && [ ! -e /etc/adjtime ]; then
-               printf "0.0 0 0.0\n0\nUTC\n" > /etc/adjtime
-           fi
-
-           if [ -d /run/udev ] || [ -d /dev/.udev ]; then
-               return 0
-           fi
-
-           if [ "$HWCLOCKACCESS" != no ]; then
-               log_action_msg "Setting the system clock"
-
-               # Just for reporting.
-               if sed '3!d' /etc/adjtime | grep -q '^UTC$'; then
-                   UTC="--utc"
-               else
-                   UTC=
-               fi
-               # Copies Hardware Clock time to System Clock using the correct
-               # timezone for hardware clocks in local time, and sets kernel
-               # timezone. DO NOT REMOVE.
-               if /sbin/hwclock --rtc=/dev/$HCTOSYS_DEVICE --hctosys $HWCLOCKPARS $BADYEAR; then
-                   #   Announce the local time.
-                   verbose_log_action_msg "System Clock set to: `date $UTC`"
-               else
-                   log_warning_msg "Unable to set System Clock to: `date $UTC`"
-               fi
-           else
-               verbose_log_action_msg "Not setting System Clock"
-           fi
-           ;;
-       stop|restart|reload|force-reload)
-           #
-           # Updates the Hardware Clock with the System Clock time.
-           # This will *override* any changes made to the Hardware Clock.
-           #
-           # WARNING: If you disable this, any changes to the system
-           #          clock will not be carried across reboots.
-           #
-
-           if [ "$HWCLOCKACCESS" != no ]; then
-               log_action_msg "Saving the system clock"
-               if /sbin/hwclock --rtc=/dev/$HCTOSYS_DEVICE --systohc $HWCLOCKPARS $BADYEAR; then
-                   verbose_log_action_msg "Hardware Clock updated to `date`"
-               fi
-           else
-               verbose_log_action_msg "Not saving System Clock"
-           fi
-           ;;
-       show)
-           if [ "$HWCLOCKACCESS" != no ]; then
-               /sbin/hwclock --rtc=/dev/$HCTOSYS_DEVICE --show $HWCLOCKPARS $BADYEAR
-           fi
-           ;;
-       *)
-           log_success_msg "Usage: hwclock.sh {start|stop|reload|force-reload|show}"
-           log_success_msg "       start sets kernel (system) clock from hardware (RTC) clock"
-           log_success_msg "       stop and reload set hardware (RTC) clock from kernel (system) clock"
-           return 1
-           ;;
+        start)
+            # start is handled by /usr/lib/udev/rules.d/85-hwclock.rules.
+            return 0
+            ;;
+        stop|restart|reload|force-reload)
+            # Updates the Hardware Clock with the System Clock time.
+            # This will *override* any changes made to the Hardware Clock,
+            # for example by the Linux kernel when NTP is in use.
+            log_action_msg "Saving the system clock to /dev/$HCTOSYS_DEVICE"
+            if /sbin/hwclock --rtc=/dev/$HCTOSYS_DEVICE --systohc; then
+                verbose_log_action_msg "Hardware Clock updated to `date`"
+            fi
+            ;;
+        show)
+            /sbin/hwclock --rtc=/dev/$HCTOSYS_DEVICE --show
+            ;;
+        *)
+            log_success_msg "Usage: hwclock.sh {stop|reload|force-reload|show}"
+            log_success_msg "       stop and reload set hardware (RTC) clock from kernel (system) clock"
+            return 1
+            ;;
      esac
  }
  
diff --git a/init.d/network-manager b/init.d/network-manager

deleted file mode 100755 (executable)

index ac9c584..0000000
--- a/init.d/network-manager
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          network-manager
-# Required-Start:    $remote_fs dbus udev
-# Required-Stop:     $remote_fs dbus udev
-# Should-Start:             $syslog
-# Should-Stop:       $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: network connection manager
-# Description:       Daemon for automatically switching network 
-#                   connections to the best available connection.
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DESC="network connection manager"
-NAME="NetworkManager"
-
-DAEMON=/usr/sbin/$NAME
-
-PIDFILE=/run/$NAME/$NAME.pid
-
-SCRIPTNAME=/etc/init.d/network-manager
-
-# Gracefully exit if the package has been removed.
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-test -f /etc/default/NetworkManager && . /etc/default/NetworkManager
-
-#
-#      Function that starts the daemon/service.
-#
-d_start() {
-       start-stop-daemon --start --quiet --pidfile $PIDFILE \
-               --exec $DAEMON -- $DAEMON_OPTS
-}
-
-#
-#      Function that stops the daemon/service.
-#
-d_stop() {
-       start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \
-               --exec $DAEMON
-}
-
-d_reload() {
-       start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE \
-               --exec $DAEMON
-}
-
-case "$1" in
-  start)
-       log_daemon_msg "Starting $DESC" "$NAME"
-       d_start
-       case "$?" in
-               0) log_end_msg 0 ;;
-               1) log_progress_msg "already started"
-                  log_end_msg 0 ;;
-               *) log_end_msg 1 ;;
-       esac
-       ;;
-  stop)
-       log_daemon_msg "Stopping $DESC" "$NAME"
-       d_stop
-       case "$?" in
-               0) log_end_msg 0 ;;
-               1) log_progress_msg "already stopped"
-                  log_end_msg 0 ;;
-               *) log_end_msg 1 ;;
-       esac
-       ;;
-  reload|force-reload)
-       log_daemon_msg "Reloading $DESC" "$NAME"
-       d_reload
-       log_end_msg $?
-       ;;
-  restart)
-       $0 stop
-       $0 start
-       ;;
-  status)
-       status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
-       ;;
-  *)
-       echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2
-       exit 1
-       ;;
-esac
-
-exit 0
diff --git a/init.d/pppd-dns b/init.d/pppd-dns

deleted file mode 100755 (executable)

index 38baef0..0000000
--- a/init.d/pppd-dns
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh -e
-### BEGIN INIT INFO
-# Provides:          pppd-dns
-# Required-Start:    $local_fs
-# Required-Stop:
-# Default-Start:     S
-# Default-Stop:
-# Short-Description: Restore resolv.conf if the system crashed.
-# Description:       Restore /etc/resolv.conf if the system crashed before the
-#                    ppp link was shut down.
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-case "$1" in
-  start) ;;
-  stop|restart|force-reload) exit 0 ;;
-  *) echo "Usage: $0 {start|stop|restart|force-reload}" >&2; exit 1 ;;
-esac
-
-[ -x /etc/ppp/ip-down.d/0000usepeerdns ] \
-       && exec /etc/ppp/ip-down.d/0000usepeerdns
-
diff --git a/init.d/procps b/init.d/procps

index 4d7f4ceb832127cf96e8f2576ff889ac26562432..c9a494b37439b5f042f0b47228204d954203d404 100755 (executable)
--- a/init.d/procps
+++ b/init.d/procps
@@ -30,5 +30,6 @@ do_start_cmd() {
         return $STATUS
  }
  
+do_reload() { call do_start_cmd; }
  do_stop() { return 0; }
  do_status() { return 0; }
diff --git a/init.d/rsyslog b/init.d/rsyslog

deleted file mode 100755 (executable)

index 14017cf..0000000
--- a/init.d/rsyslog
+++ /dev/null
@@ -1,129 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          rsyslog
-# Required-Start:    $remote_fs $time
-# Required-Stop:     umountnfs $time
-# X-Stop-After:      sendsigs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: enhanced syslogd
-# Description:       Rsyslog is an enhanced multi-threaded syslogd.
-#                    It is quite compatible to stock sysklogd and can be 
-#                    used as a drop-in replacement.
-### END INIT INFO
-
-#
-# Author: Michael Biebl <biebl@debian.org>
-#
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="enhanced syslogd"
-NAME=rsyslog
-
-RSYSLOGD=rsyslogd
-DAEMON=/usr/sbin/rsyslogd
-PIDFILE=/run/rsyslogd.pid
-
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Define LSB log_* functions.
-. /lib/lsb/init-functions
-
-do_start()
-{
-       # Return
-       #   0 if daemon has been started
-       #   1 if daemon was already running
-       #   other if daemon could not be started or a failure occured
-       start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $RSYSLOGD_OPTIONS
-}
-
-do_stop()
-{
-       # Return
-       #   0 if daemon has been stopped
-       #   1 if daemon was already stopped
-       #   other if daemon could not be stopped or a failure occurred
-       start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON
-}
-
-#
-# Tell rsyslogd to close all open files
-#
-do_rotate() {
-       start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE --exec $DAEMON
-}
-
-create_xconsole() {
-       XCONSOLE=/dev/xconsole
-       if [ "$(uname -s)" != "Linux" ]; then
-               XCONSOLE=/run/xconsole
-               ln -sf $XCONSOLE /dev/xconsole
-       fi
-       if [ ! -e $XCONSOLE ]; then
-               mknod -m 640 $XCONSOLE p
-               chown root:adm $XCONSOLE
-               [ -x /sbin/restorecon ] && /sbin/restorecon $XCONSOLE
-       fi
-}
-
-sendsigs_omit() {
-       OMITDIR=/run/sendsigs.omit.d
-       mkdir -p $OMITDIR
-       ln -sf $PIDFILE $OMITDIR/rsyslog
-}
-
-case "$1" in
-  start)
-       log_daemon_msg "Starting $DESC" "$RSYSLOGD"
-       create_xconsole
-       do_start
-       case "$?" in
-               0) sendsigs_omit
-                  log_end_msg 0 ;;
-               1) log_progress_msg "already started"
-                  log_end_msg 0 ;;
-               *) log_end_msg 1 ;;
-       esac
-
-       ;;
-  stop)
-       log_daemon_msg "Stopping $DESC" "$RSYSLOGD"
-       do_stop
-       case "$?" in
-               0) log_end_msg 0 ;;
-               1) log_progress_msg "already stopped"
-                  log_end_msg 0 ;;
-               *) log_end_msg 1 ;;
-       esac
-
-       ;;
-  rotate)
-       log_daemon_msg "Closing open files" "$RSYSLOGD"
-       do_rotate
-       log_end_msg $?
-       ;;
-  restart|force-reload)
-       $0 stop
-       $0 start
-       ;;
-  try-restart)
-       $0 status >/dev/null 2>&1 && $0 restart
-       ;;
-  status)
-       status_of_proc -p $PIDFILE $DAEMON $RSYSLOGD && exit 0 || exit $?
-       ;;
-  *)
-       echo "Usage: $SCRIPTNAME {start|stop|rotate|restart|force-reload|try-restart|status}" >&2
-       exit 3
-       ;;
-esac
-
-:
diff --git a/init.d/x11-common b/init.d/x11-common

index 63c3c307043bd94f2c7c3338affd219f3fcc2986..afea20b72f09ae0e3ef926d397ee1c9a2a8bf218 100755 (executable)
--- a/init.d/x11-common
+++ b/init.d/x11-common
@@ -22,7 +22,7 @@ fi
  
  do_restorecon () {
    # Restore file security context (SELinux).
-  if which restorecon >/dev/null 2>&1; then
+  if command -v restorecon >/dev/null 2>&1; then
      restorecon "$1"
    fi
  }
diff --git a/issue b/issue

index a283f3d5e4814b03e3efd70c2b3df02237cec256..b133a980d92a9f8646be714ec4fb24c17e9a3b4b 100644 (file)
--- a/issue
+++ b/issue
@@ -1,2 +1,2 @@
-Linux Mint 20.3 Una \n \l
+Linux Mint 21 Vanessa \n \l
  
diff --git a/issue.net b/issue.net

index a25ca734564753018e7e63e3ca09042a3b404b3d..c5c3cabedf715dfa2f32a5177c95b3d26ec0b101 100644 (file)
--- a/issue.net
+++ b/issue.net
@@ -1 +1 @@
-Linux Mint 20.3 Una
+Linux Mint 21 Vanessa
diff --git a/libreoffice/registry/oo-ad-ldap.xcd.sample b/libreoffice/registry/oo-ad-ldap.xcd.sample

new file mode 120000 (symlink)

index 0000000..1353840
--- /dev/null
+++ b/libreoffice/registry/oo-ad-ldap.xcd.sample
@@ -0,0 +1 @@
+/usr/share/doc/libreoffice-common/examples/oo-ad-ldap.xcd.sample
+\ No newline at end of file
diff --git a/libreoffice/registry/oo-ldap.xcd.sample b/libreoffice/registry/oo-ldap.xcd.sample

new file mode 120000 (symlink)

index 0000000..c902585
--- /dev/null
+++ b/libreoffice/registry/oo-ldap.xcd.sample
@@ -0,0 +1 @@
+/usr/share/doc/libreoffice-common/examples/oo-ldap.xcd.sample
+\ No newline at end of file
diff --git a/libvirt/nwfilter/allow-arp.xml b/libvirt/nwfilter/allow-arp.xml

deleted file mode 100644 (file)

index c19bce5..0000000
--- a/libvirt/nwfilter/allow-arp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit allow-arp
-or other application using the libvirt API.
--->
-
-<filter name='allow-arp' chain='arp' priority='-500'>
-  <uuid>49cdc163-2256-41bf-a493-83dd68636f4a</uuid>
-  <rule action='accept' direction='inout' priority='500'/>
-</filter>
diff --git a/libvirt/nwfilter/allow-dhcp-server.xml b/libvirt/nwfilter/allow-dhcp-server.xml

deleted file mode 100644 (file)

index cb30c59..0000000
--- a/libvirt/nwfilter/allow-dhcp-server.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit allow-dhcp-server
-or other application using the libvirt API.
--->
-
-<filter name='allow-dhcp-server' chain='ipv4' priority='-700'>
-  <uuid>b45a2be5-4de7-41e5-9bf7-529cedb55419</uuid>
-  <rule action='accept' direction='out' priority='100'>
-    <ip srcipaddr='0.0.0.0' dstipaddr='255.255.255.255' protocol='udp' srcportstart='68' dstportstart='67'/>
-  </rule>
-  <rule action='accept' direction='in' priority='100'>
-    <ip srcipaddr='$DHCPSERVER' protocol='udp' srcportstart='67' dstportstart='68'/>
-  </rule>
-</filter>
diff --git a/libvirt/nwfilter/allow-dhcp.xml b/libvirt/nwfilter/allow-dhcp.xml

deleted file mode 100644 (file)

index ea1f2e2..0000000
--- a/libvirt/nwfilter/allow-dhcp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit allow-dhcp
-or other application using the libvirt API.
--->
-
-<filter name='allow-dhcp' chain='ipv4' priority='-700'>
-  <uuid>fcce2359-479a-48f1-91b8-4ced48a02bac</uuid>
-  <rule action='accept' direction='out' priority='100'>
-    <ip srcipaddr='0.0.0.0' dstipaddr='255.255.255.255' protocol='udp' srcportstart='68' dstportstart='67'/>
-  </rule>
-  <rule action='accept' direction='in' priority='100'>
-    <ip protocol='udp' srcportstart='67' dstportstart='68'/>
-  </rule>
-</filter>
diff --git a/libvirt/nwfilter/allow-incoming-ipv4.xml b/libvirt/nwfilter/allow-incoming-ipv4.xml

deleted file mode 100644 (file)

index 16fe186..0000000
--- a/libvirt/nwfilter/allow-incoming-ipv4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit allow-incoming-ipv4
-or other application using the libvirt API.
--->
-
-<filter name='allow-incoming-ipv4' chain='ipv4' priority='-700'>
-  <uuid>4c4ef777-1f4b-4f41-836b-551e6ba7bbfe</uuid>
-  <rule action='accept' direction='in' priority='500'/>
-</filter>
diff --git a/libvirt/nwfilter/allow-ipv4.xml b/libvirt/nwfilter/allow-ipv4.xml

deleted file mode 100644 (file)

index a4c37e8..0000000
--- a/libvirt/nwfilter/allow-ipv4.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit allow-ipv4
-or other application using the libvirt API.
--->
-
-<filter name='allow-ipv4' chain='ipv4' priority='-700'>
-  <uuid>f00ad379-eac4-4b69-a6e7-b9e1883204a1</uuid>
-  <rule action='accept' direction='inout' priority='500'/>
-</filter>
diff --git a/libvirt/nwfilter/clean-traffic-gateway.xml b/libvirt/nwfilter/clean-traffic-gateway.xml

deleted file mode 100644 (file)

index 6b04194..0000000
--- a/libvirt/nwfilter/clean-traffic-gateway.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit clean-traffic-gateway
-or other application using the libvirt API.
--->
-
-<filter name='clean-traffic-gateway' chain='root'>
-  <uuid>bcb40bfd-918d-4668-bd78-4aa428884588</uuid>
-  <filterref filter='no-mac-spoofing'/>
-  <filterref filter='no-ip-spoofing'/>
-  <filterref filter='no-arp-spoofing'/>
-  <rule action='accept' direction='inout' priority='-500'>
-    <mac protocolid='arp'/>
-  </rule>
-  <rule action='accept' direction='in' priority='500'>
-    <mac srcmacaddr='$GATEWAY_MAC'/>
-  </rule>
-  <rule action='accept' direction='out' priority='500'>
-    <mac dstmacaddr='$GATEWAY_MAC'/>
-  </rule>
-  <filterref filter='no-other-l2-traffic'/>
-  <filterref filter='qemu-announce-self'/>
-</filter>
diff --git a/libvirt/nwfilter/clean-traffic.xml b/libvirt/nwfilter/clean-traffic.xml

deleted file mode 100644 (file)

index 6458c2b..0000000
--- a/libvirt/nwfilter/clean-traffic.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit clean-traffic
-or other application using the libvirt API.
--->
-
-<filter name='clean-traffic' chain='root'>
-  <uuid>cc37ae21-ce67-427f-8fe6-59ca5a382055</uuid>
-  <filterref filter='no-mac-spoofing'/>
-  <filterref filter='no-ip-spoofing'/>
-  <rule action='accept' direction='out' priority='-650'>
-    <mac protocolid='ipv4'/>
-  </rule>
-  <filterref filter='allow-incoming-ipv4'/>
-  <filterref filter='no-arp-spoofing'/>
-  <rule action='accept' direction='inout' priority='-500'>
-    <mac protocolid='arp'/>
-  </rule>
-  <filterref filter='no-other-l2-traffic'/>
-  <filterref filter='qemu-announce-self'/>
-</filter>
diff --git a/libvirt/nwfilter/no-arp-ip-spoofing.xml b/libvirt/nwfilter/no-arp-ip-spoofing.xml

deleted file mode 100644 (file)

index a463f46..0000000
--- a/libvirt/nwfilter/no-arp-ip-spoofing.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit no-arp-ip-spoofing
-or other application using the libvirt API.
--->
-
-<filter name='no-arp-ip-spoofing' chain='arp-ip' priority='-510'>
-  <uuid>e48edfe6-0f22-4dae-92b3-e30d65d0ffe9</uuid>
-  <rule action='return' direction='out' priority='400'>
-    <arp arpsrcipaddr='$IP'/>
-  </rule>
-  <rule action='drop' direction='out' priority='1000'/>
-</filter>
diff --git a/libvirt/nwfilter/no-arp-mac-spoofing.xml b/libvirt/nwfilter/no-arp-mac-spoofing.xml

deleted file mode 100644 (file)

index b0d6e7a..0000000
--- a/libvirt/nwfilter/no-arp-mac-spoofing.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit no-arp-mac-spoofing
-or other application using the libvirt API.
--->
-
-<filter name='no-arp-mac-spoofing' chain='arp-mac' priority='-520'>
-  <uuid>0cacea96-9a8e-44f9-a538-06f0b16d9633</uuid>
-  <rule action='return' direction='out' priority='350'>
-    <arp arpsrcmacaddr='$MAC'/>
-  </rule>
-  <rule action='drop' direction='out' priority='1000'/>
-</filter>
diff --git a/libvirt/nwfilter/no-arp-spoofing.xml b/libvirt/nwfilter/no-arp-spoofing.xml

deleted file mode 100644 (file)

index 83dc61d..0000000
--- a/libvirt/nwfilter/no-arp-spoofing.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit no-arp-spoofing
-or other application using the libvirt API.
--->
-
-<filter name='no-arp-spoofing' chain='root'>
-  <uuid>cc007e40-3015-4666-918c-a985b28f61c4</uuid>
-  <filterref filter='no-arp-mac-spoofing'/>
-  <filterref filter='no-arp-ip-spoofing'/>
-</filter>
diff --git a/libvirt/nwfilter/no-ip-multicast.xml b/libvirt/nwfilter/no-ip-multicast.xml

deleted file mode 100644 (file)

index 46963a5..0000000
--- a/libvirt/nwfilter/no-ip-multicast.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit no-ip-multicast
-or other application using the libvirt API.
--->
-
-<filter name='no-ip-multicast' chain='ipv4' priority='-700'>
-  <uuid>d9a3c4e8-6f6e-414c-aa69-d4f39de10f8c</uuid>
-  <rule action='drop' direction='out' priority='500'>
-    <ip dstipaddr='224.0.0.0' dstipmask='4'/>
-  </rule>
-</filter>
diff --git a/libvirt/nwfilter/no-ip-spoofing.xml b/libvirt/nwfilter/no-ip-spoofing.xml

deleted file mode 100644 (file)

index f64c0da..0000000
--- a/libvirt/nwfilter/no-ip-spoofing.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit no-ip-spoofing
-or other application using the libvirt API.
--->
-
-<filter name='no-ip-spoofing' chain='ipv4-ip' priority='-710'>
-  <uuid>c4328ea7-72e0-4b6e-8ff1-98cdd1dcd6f6</uuid>
-  <rule action='return' direction='out' priority='100'>
-    <ip srcipaddr='0.0.0.0' protocol='udp'/>
-  </rule>
-  <rule action='return' direction='out' priority='500'>
-    <ip srcipaddr='$IP'/>
-  </rule>
-  <rule action='drop' direction='out' priority='1000'/>
-</filter>
diff --git a/libvirt/nwfilter/no-mac-broadcast.xml b/libvirt/nwfilter/no-mac-broadcast.xml

deleted file mode 100644 (file)

index 958daf1..0000000
--- a/libvirt/nwfilter/no-mac-broadcast.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit no-mac-broadcast
-or other application using the libvirt API.
--->
-
-<filter name='no-mac-broadcast' chain='ipv4' priority='-700'>
-  <uuid>1c1e0a7f-9def-4601-8062-e6206d3f500c</uuid>
-  <rule action='drop' direction='out' priority='500'>
-    <mac dstmacaddr='ff:ff:ff:ff:ff:ff'/>
-  </rule>
-</filter>
diff --git a/libvirt/nwfilter/no-mac-spoofing.xml b/libvirt/nwfilter/no-mac-spoofing.xml

deleted file mode 100644 (file)

index c20a30b..0000000
--- a/libvirt/nwfilter/no-mac-spoofing.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit no-mac-spoofing
-or other application using the libvirt API.
--->
-
-<filter name='no-mac-spoofing' chain='mac' priority='-800'>
-  <uuid>bbc85970-2e86-487a-969b-24eb96a29793</uuid>
-  <rule action='return' direction='out' priority='500'>
-    <mac srcmacaddr='$MAC'/>
-  </rule>
-  <rule action='drop' direction='out' priority='500'>
-    <mac/>
-  </rule>
-</filter>
diff --git a/libvirt/nwfilter/no-other-l2-traffic.xml b/libvirt/nwfilter/no-other-l2-traffic.xml

deleted file mode 100644 (file)

index 9111fb3..0000000
--- a/libvirt/nwfilter/no-other-l2-traffic.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit no-other-l2-traffic
-or other application using the libvirt API.
--->
-
-<filter name='no-other-l2-traffic' chain='root'>
-  <uuid>79adc489-a486-4d83-ae77-9cfc76357bcf</uuid>
-  <rule action='drop' direction='inout' priority='1000'/>
-</filter>
diff --git a/libvirt/nwfilter/no-other-rarp-traffic.xml b/libvirt/nwfilter/no-other-rarp-traffic.xml

deleted file mode 100644 (file)

index ca7d2fb..0000000
--- a/libvirt/nwfilter/no-other-rarp-traffic.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit no-other-rarp-traffic
-or other application using the libvirt API.
--->
-
-<filter name='no-other-rarp-traffic' chain='rarp' priority='-400'>
-  <uuid>5e268392-e9bd-46fa-80fa-caedd8636615</uuid>
-  <rule action='drop' direction='inout' priority='1000'/>
-</filter>
diff --git a/libvirt/nwfilter/qemu-announce-self-rarp.xml b/libvirt/nwfilter/qemu-announce-self-rarp.xml

deleted file mode 100644 (file)

index b8e8aaf..0000000
--- a/libvirt/nwfilter/qemu-announce-self-rarp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit qemu-announce-self-rarp
-or other application using the libvirt API.
--->
-
-<filter name='qemu-announce-self-rarp' chain='rarp' priority='-400'>
-  <uuid>a2830f77-47f7-4124-b1bb-3a1a24499e81</uuid>
-  <rule action='accept' direction='out' priority='500'>
-    <rarp srcmacaddr='$MAC' dstmacaddr='ff:ff:ff:ff:ff:ff' opcode='Request_Reverse' arpsrcmacaddr='$MAC' arpdstmacaddr='$MAC' arpsrcipaddr='0.0.0.0' arpdstipaddr='0.0.0.0'/>
-  </rule>
-  <rule action='accept' direction='in' priority='500'>
-    <rarp dstmacaddr='ff:ff:ff:ff:ff:ff' opcode='Request_Reverse' arpsrcmacaddr='$MAC' arpdstmacaddr='$MAC' arpsrcipaddr='0.0.0.0' arpdstipaddr='0.0.0.0'/>
-  </rule>
-</filter>
diff --git a/libvirt/nwfilter/qemu-announce-self.xml b/libvirt/nwfilter/qemu-announce-self.xml

deleted file mode 100644 (file)

index 57f292a..0000000
--- a/libvirt/nwfilter/qemu-announce-self.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh nwfilter-edit qemu-announce-self
-or other application using the libvirt API.
--->
-
-<filter name='qemu-announce-self' chain='root'>
-  <uuid>9f30a1dc-a9f0-4968-8d08-ca1d18ec8063</uuid>
-  <rule action='accept' direction='out' priority='500'>
-    <mac protocolid='0x835'/>
-  </rule>
-  <filterref filter='qemu-announce-self-rarp'/>
-  <filterref filter='no-other-rarp-traffic'/>
-</filter>
diff --git a/libvirt/qemu/networks/default.xml b/libvirt/qemu/networks/default.xml

deleted file mode 100644 (file)

index b72f1be..0000000
--- a/libvirt/qemu/networks/default.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE
-OVERWRITTEN AND LOST. Changes to this xml configuration should be made using:
-  virsh net-edit default
-or other application using the libvirt API.
--->
-
-<network>
-  <name>default</name>
-  <uuid>a111fef7-d376-453e-916c-4acde8cdd18c</uuid>
-  <forward mode='nat'/>
-  <bridge name='virbr0' stp='on' delay='0'/>
-  <mac address='52:54:00:b9:69:25'/>
-  <ip address='192.168.122.1' netmask='255.255.255.0'>
-    <dhcp>
-      <range start='192.168.122.2' end='192.168.122.254'/>
-    </dhcp>
-  </ip>
-</network>
diff --git a/libvirt/virt-login-shell.conf b/libvirt/virt-login-shell.conf

deleted file mode 100644 (file)

index 4a504b3..0000000
--- a/libvirt/virt-login-shell.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# Master configuration file for the virt-login-shell program.
-# All settings described here are optional - if omitted, sensible
-# defaults are used.
-
-# By default, virt-login-shell will connect you to a container running
-# with the /bin/sh program.  Modify the shell variable if you want your
-# users to run a different shell or a setup container when joining a
-# container.
-#
-# This can either be just the path to a shell binary:
-#
-# shell = "/bin/bash"
-#
-# Or can be the path and extra arguments
-#
-# shell = [ "/bin/bash", "--posix" ]
-#
-# Note there is no need to pass a '--login' / '-l' argument since
-# virt-login-shell will always request a login shell
-
-# Normally virt-login-shell will always use the shell identified
-# by the 'shell' configuration setting above. If the container
-# is running a full OS, it might be desirable to allow the choice
-# of shell to be delegated to the owner of the shell, by querying
-# the /etc/passwd file inside the container
-#
-# To allow for that, uncomment the following:
-# auto_shell = 1
-#
-# NB, this should /not/ be used if any container is sharing the
-# host filesystem /etc, as this would cause virt-login-shell to
-# look at the host's /etc/passwd finding itself as the listed
-# shell. Hilarious recursion would then ensue.
-
-# allowed_users specifies the user names of all users that are allowed to
-# execute virt-login-shell.  You can specify the users as a comma
-# separated list of usernames or user groups.
-# The list of names support glob syntax.
-# To disallow all users (default)
-# allowed_users = []
-# If you do not specify any names (default) then no one is allowed
-# to use this executable.
-# To allow fred and joe only
-# allowed_users = ["fred", "joe"]
-# To allow all users within a specific group prefix the group name with %.
-# allowed_users = ["%engineers"]
-# To allow all users specify the following
-# allowed_users = [ "*" ]
diff --git a/lintianrc b/lintianrc

deleted file mode 100644 (file)

index c9c41f6..0000000
--- a/lintianrc
+++ /dev/null
@@ -1,56 +0,0 @@
-# /etc/lintianrc -- Lintian configuration file
-#
-# Note, that Lintian has reasonable default values for all variables
-# specified below. Thus, you don't have to change this file unless you
-# want something special.
-# 
-# Also note, that this file uses a special syntax:
-# Empty lines are allowed, comments are introduced by a hash sign (#).
-# All other lines must have the format
-#    VAR=text
-# or
-#    VAR="text"
-# or
-#    VAR = text
-# It is allowed to use `~' and `$HOME' in the variables, but not other
-# shell/environment variables.
-
-# Enable info tags by default (--display info)
-#display-info = yes
-
-# Limit the number of parallel unpacking jobs to X (--jobs)
-#jobs = 8
-
-# Enable pedantic tags by default (--pedantic)
-#pedantic = yes
-
-# Enable experimental tags by default (--display-experimental)
-#display-experimental = yes
-
-# Enable colored output for terminal output (--color)
-#color = auto
-
-# Show overridden tags (--show-overrides)
-#show-overrides = yes
-
-# Ignore all overrides (--no-override)
-#override = no
-
-# Verbose output by default (--verbose)
-#verbose = yes
-
-# Quiet by default (--quiet)
-#quiet = yes
-
-# Use a different directory for temporary files - useful if /tmp is a
-# tmpfs with "limited" capacity.
-#TMPDIR="/var/tmp"
-
-# Suppress the listed tags (--suppress-tags)
-#suppress-tags = debian-watch-does-not-check-gpg-signature
-
-# Suppress the tags listed in the specified file (--suppress-tags-from-file)
-#suppress-tags-from-file = /path/to/file.txt
- 
-# Specify "tag per package" display limit (--tag-display-limit)
-#tag-display-limit = 42
diff --git a/login.defs b/login.defs

index 7c32d63ec0ef5513eb2182d6c2da7ec451b9b920..c9f66459cd4244cecc37f421e97d5d66067aaf65 100644 (file)
--- a/login.defs
+++ b/login.defs
@@ -150,6 +150,11 @@ ERASECHAR  0177
  KILLCHAR       025
  UMASK          022
  
+# HOME_MODE is used by useradd(8) and newusers(8) to set the mode for new
+# home directories.
+# If HOME_MODE is not set, the value of UMASK is used to create the mode.
+HOME_MODE      0750
+
  #
  # Password aging controls:
  #
diff --git a/lsb-release b/lsb-release

index 533c636a686a5f9bbb31cead821adbee8967611d..507341d6a40be3a033f6e240028da7492b959cbe 100644 (file)
--- a/lsb-release
+++ b/lsb-release
@@ -1,4 +1,4 @@
  DISTRIB_ID=LinuxMint
-DISTRIB_RELEASE=20.3
-DISTRIB_CODENAME=una
-DISTRIB_DESCRIPTION="Linux Mint 20.3 Una"
+DISTRIB_RELEASE=21
+DISTRIB_CODENAME=vanessa
+DISTRIB_DESCRIPTION="Linux Mint 21 Vanessa"
diff --git a/mailcap b/mailcap

index 7143d3e1268cd16afa66b0a89d624f1eaa5f9883..b4975e94c6b9a38e42fb8d2326298b32553c4bca 100644 (file)
--- a/mailcap
+++ b/mailcap
@@ -25,31 +25,31 @@
  
  ###############################################################################
  
-application/vnd.oasis.opendocument.database; soffice --nologo --base '%s'; edit=soffice --nologo --base '%s'; print=soffice --nologo --base -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Database"; nametemplate=%s.odb
-application/vnd.oasis.opendocument.chart; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; print=soffice --nologo --calc -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Chart"; nametemplate=%s.odc
-application/vnd.oasis.opendocument.spreadsheet; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; print=soffice --nologo --calc -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet"; nametemplate=%s.ods
-application/vnd.oasis.opendocument.spreadsheet-template; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; print=soffice --nologo --calc -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet Template"; nametemplate=%s.ots
-application/vnd.oasis.opendocument.graphics; soffice --nologo --draw '%s'; edit=soffice --nologo --draw '%s'; print=soffice --nologo --draw -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Drawing"; nametemplate=%s.odg
-application/vnd.oasis.opendocument.graphics-template; soffice --nologo --draw '%s'; edit=soffice --nologo --draw '%s'; print=soffice --nologo --draw -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Drawing Template"; nametemplate=%s.otg
-application/vnd.oasis.opendocument.presentation; soffice --nologo --impress '%s'; edit=soffice --nologo --impress '%s'; print=soffice --nologo --impress -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Presentation"; nametemplate=%s.odp
-application/vnd.oasis.opendocument.presentation-template; soffice --nologo --impress '%s'; edit=soffice --nologo --impress '%s'; print=soffice --nologo --impress -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Presentation Template"; nametemplate=%s.otp
-application/vnd.oasis.opendocument.formula; soffice --nologo --math '%s'; edit=soffice --nologo --math '%s'; print=soffice --nologo --math -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Formula"; nametemplate=%s.odf
-application/vnd.oasis.opendocument.text; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; print=soffice --nologo --writer -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Text Document"; nametemplate=%s.odt
-application/vnd.oasis.opendocument.text-master; soffice --nologo --global '%s'; edit=soffice --nologo --writer '%s'; print=soffice --nologo --writer -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Master Document"; nametemplate=%s.odm
-application/vnd.oasis.opendocument.text-template; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; print=soffice --nologo --writer -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument Text Document Template"; nametemplate=%s.ott
-application/vnd.oasis.opendocument.text-web; soffice --nologo --web '%s'; edit=soffice --nologo --web '%s'; print=soffice --nologo --web -p '%s'; test=test -n "$DISPLAY"; description="OpenDocument HTML Document Template"; nametemplate=%s.oth
-text/plain; less '%s'; needsterminal
-application/vnd.sun.xml.base; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; description="OpenOffice.org Database"; nametemplate=%s.sdb
-application/vnd.sun.xml.calc; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Spreadsheet"; nametemplate=%s.sxc
-application/vnd.sun.xml.calc.template; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Spreadsheet Template"; nametemplate=%s.stc
-application/vnd.sun.xml.draw; soffice --nologo --draw '%s'; edit=soffice --nologo --draw '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Drawing"; nametemplate=%s.sxd
-application/vnd.sun.xml.draw.template; soffice --nologo --draw '%s'; edit=soffice --nologo --draw '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Drawing Template"; nametemplate=%s.std
-application/vnd.sun.xml.impress; soffice --nologo --impress '%s'; edit=soffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Presentation"; nametemplate=%s.sxi
-application/vnd.sun.xml.impress.template; soffice --nologo --impress '%s'; edit=soffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Presentation Template"; nametemplate=%s.sti
-application/vnd.sun.xml.math; soffice --nologo --math '%s'; edit=soffice --nologo --math '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Formula"; nametemplate=%s.sxm
-application/vnd.sun.xml.writer; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; description="OpenOffice.org Text Document"; nametemplate=%s.sxw
-application/vnd.sun.xml.writer.global; soffice --nologo --global '%s'; edit=soffice --nologo --writer '%s'; description="OpenOffice.org Master Document"; nametemplate=%s.sxg
-application/vnd.sun.xml.writer.template; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; description="OpenOffice.org Text Document Template"; nametemplate=%s.stw
+application/vnd.oasis.opendocument.database; soffice --nologo --base %s; edit=soffice --nologo --base %s; print=soffice --nologo --base -p %s; test=test -n "$DISPLAY"; description="OpenDocument Database"; nametemplate=%s.odb
+application/vnd.oasis.opendocument.chart; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; print=soffice --nologo --calc -p %s; test=test -n "$DISPLAY"; description="OpenDocument Chart"; nametemplate=%s.odc
+application/vnd.oasis.opendocument.spreadsheet; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; print=soffice --nologo --calc -p %s; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet"; nametemplate=%s.ods
+application/vnd.oasis.opendocument.spreadsheet-template; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; print=soffice --nologo --calc -p %s; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet Template"; nametemplate=%s.ots
+application/vnd.oasis.opendocument.graphics; soffice --nologo --draw %s; edit=soffice --nologo --draw %s; print=soffice --nologo --draw -p %s; test=test -n "$DISPLAY"; description="OpenDocument Drawing"; nametemplate=%s.odg
+application/vnd.oasis.opendocument.graphics-template; soffice --nologo --draw %s; edit=soffice --nologo --draw %s; print=soffice --nologo --draw -p %s; test=test -n "$DISPLAY"; description="OpenDocument Drawing Template"; nametemplate=%s.otg
+application/vnd.oasis.opendocument.presentation; soffice --nologo --impress %s; edit=soffice --nologo --impress %s; print=soffice --nologo --impress -p %s; test=test -n "$DISPLAY"; description="OpenDocument Presentation"; nametemplate=%s.odp
+application/vnd.oasis.opendocument.presentation-template; soffice --nologo --impress %s; edit=soffice --nologo --impress %s; print=soffice --nologo --impress -p %s; test=test -n "$DISPLAY"; description="OpenDocument Presentation Template"; nametemplate=%s.otp
+application/vnd.oasis.opendocument.formula; soffice --nologo --math %s; edit=soffice --nologo --math %s; print=soffice --nologo --math -p %s; test=test -n "$DISPLAY"; description="OpenDocument Formula"; nametemplate=%s.odf
+application/vnd.oasis.opendocument.text; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; print=soffice --nologo --writer -p %s; test=test -n "$DISPLAY"; description="OpenDocument Text Document"; nametemplate=%s.odt
+application/vnd.oasis.opendocument.text-master; soffice --nologo --global %s; edit=soffice --nologo --writer %s; print=soffice --nologo --writer -p %s; test=test -n "$DISPLAY"; description="OpenDocument Master Document"; nametemplate=%s.odm
+application/vnd.oasis.opendocument.text-template; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; print=soffice --nologo --writer -p %s; test=test -n "$DISPLAY"; description="OpenDocument Text Document Template"; nametemplate=%s.ott
+application/vnd.oasis.opendocument.text-web; soffice --nologo --web %s; edit=soffice --nologo --web %s; print=soffice --nologo --web -p %s; test=test -n "$DISPLAY"; description="OpenDocument HTML Document Template"; nametemplate=%s.oth
+text/plain; less %s; needsterminal
+application/vnd.sun.xml.base; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; description="OpenOffice.org Database"; nametemplate=%s.sdb
+application/vnd.sun.xml.calc; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; test=test -n "$DISPLAY"; description="OpenOffice.org Spreadsheet"; nametemplate=%s.sxc
+application/vnd.sun.xml.calc.template; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; test=test -n "$DISPLAY"; description="OpenOffice.org Spreadsheet Template"; nametemplate=%s.stc
+application/vnd.sun.xml.draw; soffice --nologo --draw %s; edit=soffice --nologo --draw %s; test=test -n "$DISPLAY"; description="OpenOffice.org Drawing"; nametemplate=%s.sxd
+application/vnd.sun.xml.draw.template; soffice --nologo --draw %s; edit=soffice --nologo --draw %s; test=test -n "$DISPLAY"; description="OpenOffice.org Drawing Template"; nametemplate=%s.std
+application/vnd.sun.xml.impress; soffice --nologo --impress %s; edit=soffice --nologo --impress %s; test=test -n "$DISPLAY"; description="OpenOffice.org Presentation"; nametemplate=%s.sxi
+application/vnd.sun.xml.impress.template; soffice --nologo --impress %s; edit=soffice --nologo --impress %s; test=test -n "$DISPLAY"; description="OpenOffice.org Presentation Template"; nametemplate=%s.sti
+application/vnd.sun.xml.math; soffice --nologo --math %s; edit=soffice --nologo --math %s; test=test -n "$DISPLAY"; description="OpenOffice.org Formula"; nametemplate=%s.sxm
+application/vnd.sun.xml.writer; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; description="OpenOffice.org Text Document"; nametemplate=%s.sxw
+application/vnd.sun.xml.writer.global; soffice --nologo --global %s; edit=soffice --nologo --writer %s; description="OpenOffice.org Master Document"; nametemplate=%s.sxg
+application/vnd.sun.xml.writer.template; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; description="OpenOffice.org Text Document Template"; nametemplate=%s.stw
  image/svg+xml; inkscape %s; description="Scalable Vector Graphics"; test=test -n "$DISPLAY"; print=inkscape --print='|lp' %s; edit=inkscape %s; compose=inkscape %s
  image/svg; inkscape %s; description="Scalable Vector Graphics"; test=test -n "$DISPLAY"; print=inkscape --print='|lp' %s; edit=inkscape %s;  compose=inkscape %s
  image/svg+xml; false; description="Scalable Vector Graphics"; test=test -z "$DISPLAY"; print=inkscape --print='|lp' %s
@@ -66,10 +66,10 @@ audio/x-mp3; vlc %s; nametemplate=%s.mp3; description="MPEG Audio"; test=test -n
  audio/mpeg4; vlc %s; description="MPEG-4 Audio"; test=test -n "$DISPLAY"
  application/mpeg4-iod; vlc %s; description="MPEG-4 Video"; test=test -n "$DISPLAY"
  application/mpeg4-muxcodetable; vlc %s; description="MPEG-4 Video"; test=test -n "$DISPLAY"
-application/x-troff-man; /usr/bin/man -X100 -l '%s'; test=test -n "$DISPLAY" -a -e /usr/bin/gxditview; description=Man page
-text/troff; /usr/bin/man -X100 -l '%s'; test=test -n "$DISPLAY" -a -e /usr/bin/gxditview; description=Man page
-application/x-troff-man; /usr/bin/man -l '%s'; needsterminal; description=Man page
-text/troff; /usr/bin/man -l '%s'; needsterminal; description=Man page
+application/x-troff-man; /usr/bin/man -X100 -l %s; test=test -n "$DISPLAY" -a -e /usr/bin/gxditview; description=Man page
+text/troff; /usr/bin/man -X100 -l %s; test=test -n "$DISPLAY" -a -e /usr/bin/gxditview; description=Man page
+application/x-troff-man; /usr/bin/man -l %s; needsterminal; description=Man page
+text/troff; /usr/bin/man -l %s; needsterminal; description=Man page
  text/html; /usr/bin/sensible-browser %s; description=HTML Text; nametemplate=%s.html
  application/x-troff-man; /usr/bin/nroff -mandoc -Tutf8; copiousoutput; print=/usr/bin/nroff -mandoc -Tutf8 | print text/plain:-
  text/troff; /usr/bin/nroff -mandoc -Tutf8; copiousoutput; print=/usr/bin/nroff -mandoc -Tutf8 | print text/plain:-
@@ -130,14 +130,14 @@ video/webm; /usr/bin/mplayer %s; description="WebM video"; test=test -n "$DISPLA
  image/jpeg; pix '%s'; test=test -n "$DISPLAY"
  image/gif; pix '%s'; test=test -n "$DISPLAY"
  image/png; pix '%s'; test=test -n "$DISPLAY"
-application/x-ogg; rhythmbox '%s'; description="Ogg Vorbis audio"; test=test -n "$DISPLAY"; nametemplate=%s.ogg
-application/ogg; rhythmbox '%s'; description="Ogg Media"; test=test -n "$DISPLAY"
-audio/x-mp3; rhythmbox '%s'; description="MP3 audio"; test=test -n "$DISPLAY"; nametemplate=%s.mp3
-audio/x-scpls; rhythmbox '%s'; description="MP3 ShoutCast playlist"; test=test -n "$DISPLAY"; nametemplate=%s.pls
-audio/x-mpeg; rhythmbox '%s'; description="MP3 audio"; test=test -n "$DISPLAY"
-audio/mpeg; rhythmbox '%s'; description="MP3 audio"; test=test -n "$DISPLAY"
-audio/x-mpegurl; rhythmbox '%s'; description="Playlist"; test=test -n "$DISPLAY"; nametemplate=%s.m3u
-application/x-flac; rhythmbox '%s'; description="FLAC audio"; test=test -n "$DISPLAY"; nametemplate=%s.flac
+application/x-ogg; rhythmbox %s; description="Ogg Vorbis audio"; test=test -n "$DISPLAY"; nametemplate=%s.ogg
+application/ogg; rhythmbox %s; description="Ogg Media"; test=test -n "$DISPLAY"
+audio/x-mp3; rhythmbox %s; description="MP3 audio"; test=test -n "$DISPLAY"; nametemplate=%s.mp3
+audio/x-scpls; rhythmbox %s; description="MP3 ShoutCast playlist"; test=test -n "$DISPLAY"; nametemplate=%s.pls
+audio/x-mpeg; rhythmbox %s; description="MP3 audio"; test=test -n "$DISPLAY"
+audio/mpeg; rhythmbox %s; description="MP3 audio"; test=test -n "$DISPLAY"
+audio/x-mpegurl; rhythmbox %s; description="Playlist"; test=test -n "$DISPLAY"; nametemplate=%s.m3u
+application/x-flac; rhythmbox %s; description="FLAC audio"; test=test -n "$DISPLAY"; nametemplate=%s.flac
  application/x-bittorrent; transmission-gtk %s; description="GTK-based BitTorrent client"; test=test -n "$DISPLAY"
  text/plain; more %s; needsterminal
  x-scheme-handler/apt; apturl %s; test=test -n "$DISPLAY"
@@ -146,27 +146,27 @@ x-content/blank-cd; nautilus --no-default-window --no-desktop burn:///  %s; test
  x-content/blank-dvd; nautilus --no-default-window --no-desktop burn:///  %s; test=test -n "$DISPLAY"
  x-content/blank-bd; nautilus --no-default-window --no-desktop burn:///  %s; test=test -n "$DISPLAY"
  x-content/blank-hddvd; nautilus --no-default-window --no-desktop burn:///  %s; test=test -n "$DISPLAY"
-application/x-cd-image; brasero --video %s; test=test -n "$DISPLAY"
-application/x-cdrdao-toc; brasero --video %s; test=test -n "$DISPLAY"
-application/x-cue; brasero --video %s; test=test -n "$DISPLAY"
-application/x-toc; brasero --video %s; test=test -n "$DISPLAY"
-audio/x-scpls; brasero --video %s; test=test -n "$DISPLAY"
-audio/x-ms-asx; brasero --video %s; test=test -n "$DISPLAY"
-audio/x-mp3-playlist; brasero --video %s; test=test -n "$DISPLAY"
-audio/x-mpegurl; brasero --video %s; test=test -n "$DISPLAY"
-application/x-brasero; brasero --video %s; test=test -n "$DISPLAY"
-x-content/audio-cdda; brasero --video %s; test=test -n "$DISPLAY"
-x-content/video-dvd; brasero --video %s; test=test -n "$DISPLAY"
-x-content/video-vcd; brasero --video %s; test=test -n "$DISPLAY"
-x-content/video-svcd; brasero --video %s; test=test -n "$DISPLAY"
-x-content/image-picturecd; brasero --video %s; test=test -n "$DISPLAY"
+application/x-cd-image; brasero %s; test=test -n "$DISPLAY"
+application/x-cdrdao-toc; brasero %s; test=test -n "$DISPLAY"
+application/x-cue; brasero %s; test=test -n "$DISPLAY"
+application/x-toc; brasero %s; test=test -n "$DISPLAY"
+audio/x-scpls; brasero %s; test=test -n "$DISPLAY"
+audio/x-ms-asx; brasero %s; test=test -n "$DISPLAY"
+audio/x-mp3-playlist; brasero %s; test=test -n "$DISPLAY"
+audio/x-mpegurl; brasero %s; test=test -n "$DISPLAY"
+application/x-brasero; brasero %s; test=test -n "$DISPLAY"
+x-content/audio-cdda; brasero %s; test=test -n "$DISPLAY"
+x-content/video-dvd; brasero %s; test=test -n "$DISPLAY"
+x-content/video-vcd; brasero %s; test=test -n "$DISPLAY"
+x-content/video-svcd; brasero %s; test=test -n "$DISPLAY"
+x-content/image-picturecd; brasero %s; test=test -n "$DISPLAY"
  x-content/software; /usr/bin/caja-autorun-software %s; test=test -n "$DISPLAY"
  inode/directory; /usr/bin/caja --no-desktop %s; test=test -n "$DISPLAY"
  application/x-mate-saved-search; /usr/bin/caja --no-desktop %s; test=test -n "$DISPLAY"
-image/png; drawing --edit-clipboard %s; test=test -n "$DISPLAY"
-image/bmp; drawing --edit-clipboard %s; test=test -n "$DISPLAY"
-image/jpeg; drawing --edit-clipboard %s; test=test -n "$DISPLAY"
-application/vnd.nextcloud; nextcloud --quit %s; test=test -n "$DISPLAY"
+image/png; drawing %s; test=test -n "$DISPLAY"
+image/bmp; drawing %s; test=test -n "$DISPLAY"
+image/jpeg; drawing %s; test=test -n "$DISPLAY"
+application/vnd.nextcloud; nextcloud %s; test=test -n "$DISPLAY"
  image/avs; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY"
  image/bie; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY"
  image/x-ms-bmp; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY"
@@ -267,21 +267,21 @@ application/zip; engrampa %s; test=test -n "$DISPLAY"
  application/x-archive; engrampa %s; test=test -n "$DISPLAY"
  application/vnd.ms-cab-compressed; engrampa %s; test=test -n "$DISPLAY"
  application/x-fskin; fcitx-skin-installer %s; test=test -n "$DISPLAY"
-text/html; firefox -private-window %s; test=test -n "$DISPLAY"
-text/xml; firefox -private-window %s; test=test -n "$DISPLAY"
-application/xhtml+xml; firefox -private-window %s; test=test -n "$DISPLAY"
-application/xml; firefox -private-window %s; test=test -n "$DISPLAY"
-application/rss+xml; firefox -private-window %s; test=test -n "$DISPLAY"
-application/rdf+xml; firefox -private-window %s; test=test -n "$DISPLAY"
-image/gif; firefox -private-window %s; test=test -n "$DISPLAY"
-image/jpeg; firefox -private-window %s; test=test -n "$DISPLAY"
-image/png; firefox -private-window %s; test=test -n "$DISPLAY"
-x-scheme-handler/http; firefox -private-window %s; test=test -n "$DISPLAY"
-x-scheme-handler/https; firefox -private-window %s; test=test -n "$DISPLAY"
-x-scheme-handler/ftp; firefox -private-window %s; test=test -n "$DISPLAY"
-x-scheme-handler/chrome; firefox -private-window %s; test=test -n "$DISPLAY"
-video/webm; firefox -private-window %s; test=test -n "$DISPLAY"
-application/x-xpinstall; firefox -private-window %s; test=test -n "$DISPLAY"
+text/html; firefox %s; test=test -n "$DISPLAY"
+text/xml; firefox %s; test=test -n "$DISPLAY"
+application/xhtml+xml; firefox %s; test=test -n "$DISPLAY"
+application/xml; firefox %s; test=test -n "$DISPLAY"
+application/rss+xml; firefox %s; test=test -n "$DISPLAY"
+application/rdf+xml; firefox %s; test=test -n "$DISPLAY"
+image/gif; firefox %s; test=test -n "$DISPLAY"
+image/jpeg; firefox %s; test=test -n "$DISPLAY"
+image/png; firefox %s; test=test -n "$DISPLAY"
+x-scheme-handler/http; firefox %s; test=test -n "$DISPLAY"
+x-scheme-handler/https; firefox %s; test=test -n "$DISPLAY"
+x-scheme-handler/ftp; firefox %s; test=test -n "$DISPLAY"
+x-scheme-handler/chrome; firefox %s; test=test -n "$DISPLAY"
+video/webm; firefox %s; test=test -n "$DISPLAY"
+application/x-xpinstall; firefox %s; test=test -n "$DISPLAY"
  application/ogg; ghb %s; test=test -n "$DISPLAY"
  application/x-extension-mp4; ghb %s; test=test -n "$DISPLAY"
  application/x-flac; ghb %s; test=test -n "$DISPLAY"
@@ -383,20 +383,21 @@ application/vnd.flatpak; gnome-software --local-filename %s; test=test -n "$DISP
  application/vnd.flatpak.repo; gnome-software --local-filename %s; test=test -n "$DISPLAY"
  application/vnd.flatpak.ref; gnome-software --local-filename %s; test=test -n "$DISPLAY"
  application/vnd.snap; gnome-software --local-filename %s; test=test -n "$DISPLAY"
-application/pdf; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-application/rdf+xml; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-application/rss+xml; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-application/xhtml+xml; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-application/xhtml_xml; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-application/xml; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-image/gif; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-image/jpeg; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-image/png; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-image/webp; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-text/html; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-text/xml; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-x-scheme-handler/http; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
-x-scheme-handler/https; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY"
+application/pdf; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+application/rdf+xml; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+application/rss+xml; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+application/xhtml+xml; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+application/xhtml_xml; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+application/xml; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+image/gif; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+image/jpeg; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+image/png; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+image/webp; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+text/html; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+text/xml; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+x-scheme-handler/http; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+x-scheme-handler/https; /usr/bin/google-chrome-stable %s; test=test -n "$DISPLAY"
+x-scheme-handler/geo; kde-geo-uri-handler --coordinate-template "https://www.google.com/maps/@<LAT>,<LON>,<Z>" --query-template "https://www.google.com/maps/search/<Q>" --fallback "https://www.google.com/maps/" %s; test=test -n "$DISPLAY"
  text/english; gvim -f %s; test=test -n "$DISPLAY"
  text/plain; gvim -f %s; test=test -n "$DISPLAY"
  text/x-makefile; gvim -f %s; test=test -n "$DISPLAY"
@@ -415,140 +416,148 @@ text/x-c++; gvim -f %s; test=test -n "$DISPLAY"
  application/x-java-jnlp-file; /usr/bin/javaws %s; test=test -n "$DISPLAY"
  x-scheme-handler/jnlp; /usr/bin/javaws %s; test=test -n "$DISPLAY"
  x-scheme-handler/jnlps; /usr/bin/javaws %s; test=test -n "$DISPLAY"
-application/mpeg4-iod; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/mpeg4-muxcodetable; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/mxf; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/ogg; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/ram; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/sdp; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/streamingmedia; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/vnd.apple.mpegurl; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/vnd.ms-asf; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/vnd.rn-realmedia; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/vnd.rn-realmedia-vbr; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/x-extension-m4a; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/x-extension-mp4; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/x-flac; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/x-flash-video; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/x-matroska; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/x-ogg; celluloid --new-window %s; test=test -n "$DISPLAY"
-application/x-streamingmedia; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/3gpp; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/3gpp2; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/aac; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/ac3; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/amr; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/amr-wb; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/basic; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/dv; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/eac3; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/flac; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/m4a; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/midi; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/mp1; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/mp2; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/mp3; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/mp4; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/mpeg; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/mpegurl; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/mpg; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/ogg; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/opus; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/scpls; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/vnd.dolby.heaac.1; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/vnd.dolby.heaac.2; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/vnd.dolby.mlp; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/vnd.dts; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/vnd.dts.hd; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/vnd.rn-realaudio; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/wav; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/webm; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-aac; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-aiff; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-ape; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-flac; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-gsm; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-it; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-m4a; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-matroska; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-mod; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-mp1; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-mp2; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-mp3; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-mpeg; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-mpegurl; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-mpg; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-ms-asf; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-ms-wma; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-musepack; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-pn-aiff; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-pn-au; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-pn-realaudio; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-pn-wav; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-real-audio; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-realaudio; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-s3m; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-scpls; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-shorten; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-speex; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-tta; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-vorbis; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-vorbis+ogg; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-wav; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-wavpack; celluloid --new-window %s; test=test -n "$DISPLAY"
-audio/x-xm; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/3gp; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/3gpp; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/3gpp2; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/divx; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/dv; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/fli; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/flv; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/mp2t; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/mp4; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/mp4v-es; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/mpeg; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/mpeg-system; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/msvideo; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/ogg; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/quicktime; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/vnd.mpegurl; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/vnd.rn-realvideo; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/webm; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-avi; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-flc; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-fli; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-flv; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-m4v; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-matroska; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-mpeg; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-mpeg-system; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-mpeg2; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-ms-asf; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-ms-wm; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-ms-wmv; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-ms-wmx; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-msvideo; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-nsv; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-ogm+ogg; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-theora; celluloid --new-window %s; test=test -n "$DISPLAY"
-video/x-theora+ogg; celluloid --new-window %s; test=test -n "$DISPLAY"
-x-content/audio-cdda; celluloid --new-window %s; test=test -n "$DISPLAY"
-x-content/audio-player; celluloid --new-window %s; test=test -n "$DISPLAY"
-x-content/video-dvd; celluloid --new-window %s; test=test -n "$DISPLAY"
-x-scheme-handler/mms; celluloid --new-window %s; test=test -n "$DISPLAY"
-x-scheme-handler/mmsh; celluloid --new-window %s; test=test -n "$DISPLAY"
-x-scheme-handler/rtmp; celluloid --new-window %s; test=test -n "$DISPLAY"
-x-scheme-handler/rtp; celluloid --new-window %s; test=test -n "$DISPLAY"
-x-scheme-handler/rtsp; celluloid --new-window %s; test=test -n "$DISPLAY"
-x-scheme-handler/irc; hexchat --no-auto --no-plugins %s; test=test -n "$DISPLAY"
-x-scheme-handler/ircs; hexchat --no-auto --no-plugins %s; test=test -n "$DISPLAY"
+application/mpeg4-iod; celluloid %s; test=test -n "$DISPLAY"
+application/mpeg4-muxcodetable; celluloid %s; test=test -n "$DISPLAY"
+application/mxf; celluloid %s; test=test -n "$DISPLAY"
+application/ogg; celluloid %s; test=test -n "$DISPLAY"
+application/ram; celluloid %s; test=test -n "$DISPLAY"
+application/sdp; celluloid %s; test=test -n "$DISPLAY"
+application/streamingmedia; celluloid %s; test=test -n "$DISPLAY"
+application/vnd.apple.mpegurl; celluloid %s; test=test -n "$DISPLAY"
+application/vnd.ms-asf; celluloid %s; test=test -n "$DISPLAY"
+application/vnd.rn-realmedia; celluloid %s; test=test -n "$DISPLAY"
+application/vnd.rn-realmedia-vbr; celluloid %s; test=test -n "$DISPLAY"
+application/x-extension-m4a; celluloid %s; test=test -n "$DISPLAY"
+application/x-extension-mp4; celluloid %s; test=test -n "$DISPLAY"
+application/x-flac; celluloid %s; test=test -n "$DISPLAY"
+application/x-flash-video; celluloid %s; test=test -n "$DISPLAY"
+application/x-matroska; celluloid %s; test=test -n "$DISPLAY"
+application/x-ogg; celluloid %s; test=test -n "$DISPLAY"
+application/x-streamingmedia; celluloid %s; test=test -n "$DISPLAY"
+audio/3gpp; celluloid %s; test=test -n "$DISPLAY"
+audio/3gpp2; celluloid %s; test=test -n "$DISPLAY"
+audio/aac; celluloid %s; test=test -n "$DISPLAY"
+audio/ac3; celluloid %s; test=test -n "$DISPLAY"
+audio/amr; celluloid %s; test=test -n "$DISPLAY"
+audio/amr-wb; celluloid %s; test=test -n "$DISPLAY"
+audio/basic; celluloid %s; test=test -n "$DISPLAY"
+audio/dv; celluloid %s; test=test -n "$DISPLAY"
+audio/eac3; celluloid %s; test=test -n "$DISPLAY"
+audio/flac; celluloid %s; test=test -n "$DISPLAY"
+audio/m4a; celluloid %s; test=test -n "$DISPLAY"
+audio/midi; celluloid %s; test=test -n "$DISPLAY"
+audio/mp1; celluloid %s; test=test -n "$DISPLAY"
+audio/mp2; celluloid %s; test=test -n "$DISPLAY"
+audio/mp3; celluloid %s; test=test -n "$DISPLAY"
+audio/mp4; celluloid %s; test=test -n "$DISPLAY"
+audio/mpeg; celluloid %s; test=test -n "$DISPLAY"
+audio/mpegurl; celluloid %s; test=test -n "$DISPLAY"
+audio/mpg; celluloid %s; test=test -n "$DISPLAY"
+audio/ogg; celluloid %s; test=test -n "$DISPLAY"
+audio/opus; celluloid %s; test=test -n "$DISPLAY"
+audio/scpls; celluloid %s; test=test -n "$DISPLAY"
+audio/vnd.dolby.heaac.1; celluloid %s; test=test -n "$DISPLAY"
+audio/vnd.dolby.heaac.2; celluloid %s; test=test -n "$DISPLAY"
+audio/vnd.dolby.mlp; celluloid %s; test=test -n "$DISPLAY"
+audio/vnd.dts; celluloid %s; test=test -n "$DISPLAY"
+audio/vnd.dts.hd; celluloid %s; test=test -n "$DISPLAY"
+audio/vnd.rn-realaudio; celluloid %s; test=test -n "$DISPLAY"
+audio/wav; celluloid %s; test=test -n "$DISPLAY"
+audio/webm; celluloid %s; test=test -n "$DISPLAY"
+audio/x-aac; celluloid %s; test=test -n "$DISPLAY"
+audio/x-aiff; celluloid %s; test=test -n "$DISPLAY"
+audio/x-ape; celluloid %s; test=test -n "$DISPLAY"
+audio/x-flac; celluloid %s; test=test -n "$DISPLAY"
+audio/x-gsm; celluloid %s; test=test -n "$DISPLAY"
+audio/x-it; celluloid %s; test=test -n "$DISPLAY"
+audio/x-m4a; celluloid %s; test=test -n "$DISPLAY"
+audio/x-matroska; celluloid %s; test=test -n "$DISPLAY"
+audio/x-mod; celluloid %s; test=test -n "$DISPLAY"
+audio/x-mp1; celluloid %s; test=test -n "$DISPLAY"
+audio/x-mp2; celluloid %s; test=test -n "$DISPLAY"
+audio/x-mp3; celluloid %s; test=test -n "$DISPLAY"
+audio/x-mpeg; celluloid %s; test=test -n "$DISPLAY"
+audio/x-mpegurl; celluloid %s; test=test -n "$DISPLAY"
+audio/x-mpg; celluloid %s; test=test -n "$DISPLAY"
+audio/x-ms-asf; celluloid %s; test=test -n "$DISPLAY"
+audio/x-ms-wma; celluloid %s; test=test -n "$DISPLAY"
+audio/x-musepack; celluloid %s; test=test -n "$DISPLAY"
+audio/x-pn-aiff; celluloid %s; test=test -n "$DISPLAY"
+audio/x-pn-au; celluloid %s; test=test -n "$DISPLAY"
+audio/x-pn-realaudio; celluloid %s; test=test -n "$DISPLAY"
+audio/x-pn-wav; celluloid %s; test=test -n "$DISPLAY"
+audio/x-real-audio; celluloid %s; test=test -n "$DISPLAY"
+audio/x-realaudio; celluloid %s; test=test -n "$DISPLAY"
+audio/x-s3m; celluloid %s; test=test -n "$DISPLAY"
+audio/x-scpls; celluloid %s; test=test -n "$DISPLAY"
+audio/x-shorten; celluloid %s; test=test -n "$DISPLAY"
+audio/x-speex; celluloid %s; test=test -n "$DISPLAY"
+audio/x-tta; celluloid %s; test=test -n "$DISPLAY"
+audio/x-vorbis; celluloid %s; test=test -n "$DISPLAY"
+audio/x-vorbis+ogg; celluloid %s; test=test -n "$DISPLAY"
+audio/x-wav; celluloid %s; test=test -n "$DISPLAY"
+audio/x-wavpack; celluloid %s; test=test -n "$DISPLAY"
+audio/x-xm; celluloid %s; test=test -n "$DISPLAY"
+video/3gp; celluloid %s; test=test -n "$DISPLAY"
+video/3gpp; celluloid %s; test=test -n "$DISPLAY"
+video/3gpp2; celluloid %s; test=test -n "$DISPLAY"
+video/divx; celluloid %s; test=test -n "$DISPLAY"
+video/dv; celluloid %s; test=test -n "$DISPLAY"
+video/fli; celluloid %s; test=test -n "$DISPLAY"
+video/flv; celluloid %s; test=test -n "$DISPLAY"
+video/mp2t; celluloid %s; test=test -n "$DISPLAY"
+video/mp4; celluloid %s; test=test -n "$DISPLAY"
+video/mp4v-es; celluloid %s; test=test -n "$DISPLAY"
+video/mpeg; celluloid %s; test=test -n "$DISPLAY"
+video/mpeg-system; celluloid %s; test=test -n "$DISPLAY"
+video/msvideo; celluloid %s; test=test -n "$DISPLAY"
+video/ogg; celluloid %s; test=test -n "$DISPLAY"
+video/quicktime; celluloid %s; test=test -n "$DISPLAY"
+video/vnd.mpegurl; celluloid %s; test=test -n "$DISPLAY"
+video/vnd.rn-realvideo; celluloid %s; test=test -n "$DISPLAY"
+video/webm; celluloid %s; test=test -n "$DISPLAY"
+video/x-avi; celluloid %s; test=test -n "$DISPLAY"
+video/x-flc; celluloid %s; test=test -n "$DISPLAY"
+video/x-fli; celluloid %s; test=test -n "$DISPLAY"
+video/x-flv; celluloid %s; test=test -n "$DISPLAY"
+video/x-m4v; celluloid %s; test=test -n "$DISPLAY"
+video/x-matroska; celluloid %s; test=test -n "$DISPLAY"
+video/x-mpeg; celluloid %s; test=test -n "$DISPLAY"
+video/x-mpeg-system; celluloid %s; test=test -n "$DISPLAY"
+video/x-mpeg2; celluloid %s; test=test -n "$DISPLAY"
+video/x-ms-asf; celluloid %s; test=test -n "$DISPLAY"
+video/x-ms-wm; celluloid %s; test=test -n "$DISPLAY"
+video/x-ms-wmv; celluloid %s; test=test -n "$DISPLAY"
+video/x-ms-wmx; celluloid %s; test=test -n "$DISPLAY"
+video/x-msvideo; celluloid %s; test=test -n "$DISPLAY"
+video/x-nsv; celluloid %s; test=test -n "$DISPLAY"
+video/x-ogm+ogg; celluloid %s; test=test -n "$DISPLAY"
+video/x-theora; celluloid %s; test=test -n "$DISPLAY"
+video/x-theora+ogg; celluloid %s; test=test -n "$DISPLAY"
+x-content/audio-cdda; celluloid %s; test=test -n "$DISPLAY"
+x-content/audio-player; celluloid %s; test=test -n "$DISPLAY"
+x-content/video-dvd; celluloid %s; test=test -n "$DISPLAY"
+x-scheme-handler/mms; celluloid %s; test=test -n "$DISPLAY"
+x-scheme-handler/mmsh; celluloid %s; test=test -n "$DISPLAY"
+x-scheme-handler/rtmp; celluloid %s; test=test -n "$DISPLAY"
+x-scheme-handler/rtp; celluloid %s; test=test -n "$DISPLAY"
+x-scheme-handler/rtsp; celluloid %s; test=test -n "$DISPLAY"
+x-scheme-handler/irc; hexchat --existing %s; test=test -n "$DISPLAY"
+x-scheme-handler/ircs; hexchat --existing %s; test=test -n "$DISPLAY"
  application/x-keepass2; keepassx %s; test=test -n "$DISPLAY"
  x-scheme-handler/telnet; ktelnetservice5 %s; test=test -n "$DISPLAY"
  x-scheme-handler/rlogin; ktelnetservice5 %s; test=test -n "$DISPLAY"
  x-scheme-handler/ssh; ktelnetservice5 %s; test=test -n "$DISPLAY"
-application/vnd.openofficeorg.extension; libreoffice --math %s; test=test -n "$DISPLAY"
-x-scheme-handler/vnd.libreoffice.cmis; libreoffice --math %s; test=test -n "$DISPLAY"
+application/vnd.openofficeorg.extension; libreoffice %s; test=test -n "$DISPLAY"
+x-scheme-handler/vnd.libreoffice.cmis; libreoffice %s; test=test -n "$DISPLAY"
+x-scheme-handler/vnd.sun.star.webdav; libreoffice %s; test=test -n "$DISPLAY"
+x-scheme-handler/vnd.sun.star.webdavs; libreoffice %s; test=test -n "$DISPLAY"
+x-scheme-handler/vnd.libreoffice.command; libreoffice %s; test=test -n "$DISPLAY"
+x-scheme-handler/ms-word; libreoffice %s; test=test -n "$DISPLAY"
+x-scheme-handler/ms-powerpoint; libreoffice %s; test=test -n "$DISPLAY"
+x-scheme-handler/ms-excel; libreoffice %s; test=test -n "$DISPLAY"
+x-scheme-handler/ms-visio; libreoffice %s; test=test -n "$DISPLAY"
+x-scheme-handler/ms-access; libreoffice %s; test=test -n "$DISPLAY"
  application/vnd.oasis.opendocument.text-flat-xml; libreoffice %s; test=test -n "$DISPLAY"
  application/vnd.oasis.opendocument.spreadsheet-flat-xml; libreoffice %s; test=test -n "$DISPLAY"
  application/vnd.oasis.opendocument.graphics-flat-xml; libreoffice %s; test=test -n "$DISPLAY"
@@ -573,7 +582,9 @@ application/x-jar; cautious-launcher %s /usr/bin/java -jar; test=test -n "$DISPL
  application/x-java-archive; cautious-launcher %s /usr/bin/java -jar; test=test -n "$DISPLAY"
  application/java-archive; cautious-launcher %s /usr/bin/java -jar; test=test -n "$DISPLAY"
  application/x-jar; cautious-launcher %s /usr/bin/java -jar; test=test -n "$DISPLAY"
+x-scheme-handler/geo; kde-geo-uri-handler --coordinate-template "https://www.openstreetmap.org/#map=<Z>/<LAT>/<LON>" --query-template "https://www.openstreetmap.org/search?query=<Q>" --fallback "https://www.openstreetmap.org" %s; test=test -n "$DISPLAY"
  inode/directory; baobab %s; test=test -n "$DISPLAY"
+text/calendar; gnome-calendar %s; test=test -n "$DISPLAY"
  image/bmp; eog %s; test=test -n "$DISPLAY"
  image/gif; eog %s; test=test -n "$DISPLAY"
  image/jpeg; eog %s; test=test -n "$DISPLAY"
@@ -597,50 +608,50 @@ image/svg+xml; eog %s; test=test -n "$DISPLAY"
  image/svg+xml-compressed; eog %s; test=test -n "$DISPLAY"
  image/vnd.wap.wbmp; eog %s; test=test -n "$DISPLAY"
  image/x-icns; eog %s; test=test -n "$DISPLAY"
+application/vnd.comicbook-rar; evince %s; test=test -n "$DISPLAY"
+application/vnd.comicbook+zip; evince %s; test=test -n "$DISPLAY"
+application/x-cb7; evince %s; test=test -n "$DISPLAY"
+application/x-cbr; evince %s; test=test -n "$DISPLAY"
+application/x-cbt; evince %s; test=test -n "$DISPLAY"
+application/x-cbz; evince %s; test=test -n "$DISPLAY"
+application/x-ext-cb7; evince %s; test=test -n "$DISPLAY"
+application/x-ext-cbr; evince %s; test=test -n "$DISPLAY"
+application/x-ext-cbt; evince %s; test=test -n "$DISPLAY"
+application/x-ext-cbz; evince %s; test=test -n "$DISPLAY"
+application/x-ext-djv; evince %s; test=test -n "$DISPLAY"
+application/x-ext-djvu; evince %s; test=test -n "$DISPLAY"
+image/vnd.djvu; evince %s; test=test -n "$DISPLAY"
+application/x-bzdvi; evince %s; test=test -n "$DISPLAY"
+application/x-dvi; evince %s; test=test -n "$DISPLAY"
+application/x-ext-dvi; evince %s; test=test -n "$DISPLAY"
+application/x-gzdvi; evince %s; test=test -n "$DISPLAY"
  application/pdf; evince %s; test=test -n "$DISPLAY"
  application/x-bzpdf; evince %s; test=test -n "$DISPLAY"
+application/x-ext-pdf; evince %s; test=test -n "$DISPLAY"
  application/x-gzpdf; evince %s; test=test -n "$DISPLAY"
  application/x-xzpdf; evince %s; test=test -n "$DISPLAY"
-application/x-ext-pdf; evince %s; test=test -n "$DISPLAY"
  application/postscript; evince %s; test=test -n "$DISPLAY"
  application/x-bzpostscript; evince %s; test=test -n "$DISPLAY"
  application/x-gzpostscript; evince %s; test=test -n "$DISPLAY"
-image/x-eps; evince %s; test=test -n "$DISPLAY"
+application/x-ext-eps; evince %s; test=test -n "$DISPLAY"
+application/x-ext-ps; evince %s; test=test -n "$DISPLAY"
  image/x-bzeps; evince %s; test=test -n "$DISPLAY"
+image/x-eps; evince %s; test=test -n "$DISPLAY"
  image/x-gzeps; evince %s; test=test -n "$DISPLAY"
-application/x-ext-ps; evince %s; test=test -n "$DISPLAY"
-application/x-ext-eps; evince %s; test=test -n "$DISPLAY"
-application/illustrator; evince %s; test=test -n "$DISPLAY"
-application/x-dvi; evince %s; test=test -n "$DISPLAY"
-application/x-bzdvi; evince %s; test=test -n "$DISPLAY"
-application/x-gzdvi; evince %s; test=test -n "$DISPLAY"
-application/x-ext-dvi; evince %s; test=test -n "$DISPLAY"
-image/vnd.djvu+multipage; evince %s; test=test -n "$DISPLAY"
-application/x-ext-djv; evince %s; test=test -n "$DISPLAY"
-application/x-ext-djvu; evince %s; test=test -n "$DISPLAY"
  image/tiff; evince %s; test=test -n "$DISPLAY"
-application/x-cbr; evince %s; test=test -n "$DISPLAY"
-application/x-cbz; evince %s; test=test -n "$DISPLAY"
-application/x-cb7; evince %s; test=test -n "$DISPLAY"
-application/x-cbt; evince %s; test=test -n "$DISPLAY"
-application/x-ext-cbr; evince %s; test=test -n "$DISPLAY"
-application/x-ext-cbz; evince %s; test=test -n "$DISPLAY"
-application/x-ext-cb7; evince %s; test=test -n "$DISPLAY"
-application/x-ext-cbt; evince %s; test=test -n "$DISPLAY"
-application/vnd.comicbook+zip; evince %s; test=test -n "$DISPLAY"
-application/vnd.comicbook-rar; evince %s; test=test -n "$DISPLAY"
  application/oxps; evince %s; test=test -n "$DISPLAY"
  application/vnd.ms-xpsdocument; evince %s; test=test -n "$DISPLAY"
-text/calendar; evolution -c tasks %s; test=test -n "$DISPLAY"
-text/x-vcard; evolution -c tasks %s; test=test -n "$DISPLAY"
-text/directory; evolution -c tasks %s; test=test -n "$DISPLAY"
-application/mbox; evolution -c tasks %s; test=test -n "$DISPLAY"
-message/rfc822; evolution -c tasks %s; test=test -n "$DISPLAY"
-x-scheme-handler/mailto; evolution -c tasks %s; test=test -n "$DISPLAY"
-x-scheme-handler/webcal; evolution -c tasks %s; test=test -n "$DISPLAY"
-x-scheme-handler/calendar; evolution -c tasks %s; test=test -n "$DISPLAY"
-x-scheme-handler/task; evolution -c tasks %s; test=test -n "$DISPLAY"
-x-scheme-handler/memo; evolution -c tasks %s; test=test -n "$DISPLAY"
+application/illustrator; evince %s; test=test -n "$DISPLAY"
+text/calendar; evolution %s; test=test -n "$DISPLAY"
+text/x-vcard; evolution %s; test=test -n "$DISPLAY"
+text/directory; evolution %s; test=test -n "$DISPLAY"
+application/mbox; evolution %s; test=test -n "$DISPLAY"
+message/rfc822; evolution %s; test=test -n "$DISPLAY"
+x-scheme-handler/mailto; evolution %s; test=test -n "$DISPLAY"
+x-scheme-handler/webcal; evolution %s; test=test -n "$DISPLAY"
+x-scheme-handler/calendar; evolution %s; test=test -n "$DISPLAY"
+x-scheme-handler/task; evolution %s; test=test -n "$DISPLAY"
+x-scheme-handler/memo; evolution %s; test=test -n "$DISPLAY"
  application/bzip2; file-roller %s; test=test -n "$DISPLAY"
  application/gzip; file-roller %s; test=test -n "$DISPLAY"
  application/vnd.android.package-archive; file-roller %s; test=test -n "$DISPLAY"
@@ -724,9 +735,10 @@ font/type1; /usr/libexec/font-manager/font-viewer %s; test=test -n "$DISPLAY"
  application/x-font-ttf; /usr/libexec/font-manager/font-viewer %s; test=test -n "$DISPLAY"
  application/x-font-type1; /usr/libexec/font-manager/font-viewer %s; test=test -n "$DISPLAY"
  application/x-font-otf; /usr/libexec/font-manager/font-viewer %s; test=test -n "$DISPLAY"
-text/plain; gedit --new-document %s; test=test -n "$DISPLAY"
+text/plain; gedit %s; test=test -n "$DISPLAY"
  application/vnd.geo+json; gapplication launch org.gnome.Maps %s; test=test -n "$DISPLAY"
  x-scheme-handler/geo; gapplication launch org.gnome.Maps %s; test=test -n "$DISPLAY"
+x-scheme-handler/maps; gapplication launch org.gnome.Maps %s; test=test -n "$DISPLAY"
  application/vnd.google-earth.kml+xml; gapplication launch org.gnome.Maps %s; test=test -n "$DISPLAY"
  application/gpx+xml; gapplication launch org.gnome.Maps %s; test=test -n "$DISPLAY"
  inode/directory; nautilus --new-window %s; test=test -n "$DISPLAY"
@@ -751,170 +763,100 @@ application/x-xz-compressed-tar; nautilus --new-window %s; test=test -n "$DISPLA
  application/zip; nautilus --new-window %s; test=test -n "$DISPLAY"
  application/gzip; nautilus --new-window %s; test=test -n "$DISPLAY"
  application/bzip2; nautilus --new-window %s; test=test -n "$DISPLAY"
+application/vnd.rar; nautilus --new-window %s; test=test -n "$DISPLAY"
  x-scheme-handler/appstream; gnome-software %s; test=test -n "$DISPLAY"
  x-scheme-handler/apt; gnome-software %s; test=test -n "$DISPLAY"
  x-scheme-handler/snap; gnome-software %s; test=test -n "$DISPLAY"
-application/mxf; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/ram; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/sdp; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/smil; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/smil+xml; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/vnd.apple.mpegurl; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/vnd.ms-asf; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/vnd.ms-wpl; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/vnd.rn-realmedia; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/vnd.rn-realmedia-vbr; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/x-extension-m4a; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/x-extension-mp4; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/x-flac; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/x-flash-video; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/x-matroska; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/x-netshow-channel; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/x-ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/x-quicktime-media-link; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/x-quicktimeplayer; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/x-shorten; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/x-smil; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/xspf+xml; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/3gpp; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/3gpp2; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/aac; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/ac3; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/AMR; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/AMR-WB; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/basic; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/dv; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/eac3; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/flac; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/m4a; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/midi; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/mp1; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/mp2; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/mp3; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/mp4; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/mpeg; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/mpegurl; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/mpg; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/opus; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/prs.sid; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/scpls; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/vnd.rn-realaudio; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/wav; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/webm; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-aac; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-aiff; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-ape; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-flac; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-gsm; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-it; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-m4a; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-m4b; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-matroska; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-mod; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-mp1; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-mp2; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-mp3; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-mpg; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-mpeg; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-mpegurl; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-ms-asf; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-ms-asx; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-ms-wax; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-ms-wma; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-musepack; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-opus+ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-pn-aiff; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-pn-au; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-pn-realaudio; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-pn-realaudio-plugin; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-pn-wav; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-pn-windows-acm; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-realaudio; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-real-audio; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-s3m; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-sbc; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-scpls; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-shorten; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-speex; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-stm; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-tta; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-wav; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-wavpack; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-vorbis; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-vorbis+ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
-audio/x-xm; totem --fullscreen %s; test=test -n "$DISPLAY"
-image/vnd.rn-realpix; totem --fullscreen %s; test=test -n "$DISPLAY"
-image/x-pict; totem --fullscreen %s; test=test -n "$DISPLAY"
-misc/ultravox; totem --fullscreen %s; test=test -n "$DISPLAY"
-text/google-video-pointer; totem --fullscreen %s; test=test -n "$DISPLAY"
-text/x-google-video-pointer; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/3gp; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/3gpp; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/3gpp2; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/dv; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/divx; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/fli; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/flv; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/mp2t; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/mp4; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/mp4v-es; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/mpeg; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/mpeg-system; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/msvideo; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/quicktime; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/vivo; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/vnd.divx; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/vnd.mpegurl; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/vnd.rn-realvideo; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/vnd.vivo; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/webm; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-anim; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-avi; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-flc; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-fli; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-flic; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-flv; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-m4v; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-matroska; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-mjpeg; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-mpeg; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-mpeg2; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-ms-asf; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-ms-asf-plugin; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-ms-asx; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-msvideo; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-ms-wm; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-ms-wmv; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-ms-wmx; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-ms-wvx; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-nsv; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-ogm+ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-theora; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-theora+ogg; totem --fullscreen %s; test=test -n "$DISPLAY"
-video/x-totem-stream; totem --fullscreen %s; test=test -n "$DISPLAY"
-x-content/video-dvd; totem --fullscreen %s; test=test -n "$DISPLAY"
-x-scheme-handler/pnm; totem --fullscreen %s; test=test -n "$DISPLAY"
-x-scheme-handler/mms; totem --fullscreen %s; test=test -n "$DISPLAY"
-x-scheme-handler/net; totem --fullscreen %s; test=test -n "$DISPLAY"
-x-scheme-handler/rtp; totem --fullscreen %s; test=test -n "$DISPLAY"
-x-scheme-handler/rtmp; totem --fullscreen %s; test=test -n "$DISPLAY"
-x-scheme-handler/rtsp; totem --fullscreen %s; test=test -n "$DISPLAY"
-x-scheme-handler/mmsh; totem --fullscreen %s; test=test -n "$DISPLAY"
-x-scheme-handler/uvox; totem --fullscreen %s; test=test -n "$DISPLAY"
-x-scheme-handler/icy; totem --fullscreen %s; test=test -n "$DISPLAY"
-x-scheme-handler/icyx; totem --fullscreen %s; test=test -n "$DISPLAY"
-application/x-k3b; k3b --emovix %s; test=test -n "$DISPLAY"
-application/x-iso; k3b --emovix %s; test=test -n "$DISPLAY"
-application/x-cd-image; k3b --emovix %s; test=test -n "$DISPLAY"
-application/x-cue; k3b --emovix %s; test=test -n "$DISPLAY"
-x-content/blank-cd; k3b --emovix %s; test=test -n "$DISPLAY"
-x-content/blank-dvd; k3b --emovix %s; test=test -n "$DISPLAY"
-x-content/blank-bd; k3b --emovix %s; test=test -n "$DISPLAY"
-x-content/blank-hddvd; k3b --emovix %s; test=test -n "$DISPLAY"
-application/x-k3b; k3b --emovix %s; test=test -n "$DISPLAY"
+application/mxf; totem %s; test=test -n "$DISPLAY"
+application/ram; totem %s; test=test -n "$DISPLAY"
+application/sdp; totem %s; test=test -n "$DISPLAY"
+application/vnd.apple.mpegurl; totem %s; test=test -n "$DISPLAY"
+application/vnd.ms-asf; totem %s; test=test -n "$DISPLAY"
+application/vnd.ms-wpl; totem %s; test=test -n "$DISPLAY"
+application/vnd.rn-realmedia; totem %s; test=test -n "$DISPLAY"
+application/vnd.rn-realmedia-vbr; totem %s; test=test -n "$DISPLAY"
+application/x-extension-m4a; totem %s; test=test -n "$DISPLAY"
+application/x-extension-mp4; totem %s; test=test -n "$DISPLAY"
+application/x-flash-video; totem %s; test=test -n "$DISPLAY"
+application/x-matroska; totem %s; test=test -n "$DISPLAY"
+application/x-netshow-channel; totem %s; test=test -n "$DISPLAY"
+application/x-quicktimeplayer; totem %s; test=test -n "$DISPLAY"
+application/x-shorten; totem %s; test=test -n "$DISPLAY"
+image/vnd.rn-realpix; totem %s; test=test -n "$DISPLAY"
+image/x-pict; totem %s; test=test -n "$DISPLAY"
+misc/ultravox; totem %s; test=test -n "$DISPLAY"
+text/x-google-video-pointer; totem %s; test=test -n "$DISPLAY"
+video/3gp; totem %s; test=test -n "$DISPLAY"
+video/3gpp; totem %s; test=test -n "$DISPLAY"
+video/3gpp2; totem %s; test=test -n "$DISPLAY"
+video/dv; totem %s; test=test -n "$DISPLAY"
+video/divx; totem %s; test=test -n "$DISPLAY"
+video/fli; totem %s; test=test -n "$DISPLAY"
+video/flv; totem %s; test=test -n "$DISPLAY"
+video/mp2t; totem %s; test=test -n "$DISPLAY"
+video/mp4; totem %s; test=test -n "$DISPLAY"
+video/mp4v-es; totem %s; test=test -n "$DISPLAY"
+video/mpeg; totem %s; test=test -n "$DISPLAY"
+video/mpeg-system; totem %s; test=test -n "$DISPLAY"
+video/msvideo; totem %s; test=test -n "$DISPLAY"
+video/ogg; totem %s; test=test -n "$DISPLAY"
+video/quicktime; totem %s; test=test -n "$DISPLAY"
+video/vivo; totem %s; test=test -n "$DISPLAY"
+video/vnd.divx; totem %s; test=test -n "$DISPLAY"
+video/vnd.mpegurl; totem %s; test=test -n "$DISPLAY"
+video/vnd.rn-realvideo; totem %s; test=test -n "$DISPLAY"
+video/vnd.vivo; totem %s; test=test -n "$DISPLAY"
+video/webm; totem %s; test=test -n "$DISPLAY"
+video/x-anim; totem %s; test=test -n "$DISPLAY"
+video/x-avi; totem %s; test=test -n "$DISPLAY"
+video/x-flc; totem %s; test=test -n "$DISPLAY"
+video/x-fli; totem %s; test=test -n "$DISPLAY"
+video/x-flic; totem %s; test=test -n "$DISPLAY"
+video/x-flv; totem %s; test=test -n "$DISPLAY"
+video/x-m4v; totem %s; test=test -n "$DISPLAY"
+video/x-matroska; totem %s; test=test -n "$DISPLAY"
+video/x-mjpeg; totem %s; test=test -n "$DISPLAY"
+video/x-mpeg; totem %s; test=test -n "$DISPLAY"
+video/x-mpeg2; totem %s; test=test -n "$DISPLAY"
+video/x-ms-asf; totem %s; test=test -n "$DISPLAY"
+video/x-ms-asf-plugin; totem %s; test=test -n "$DISPLAY"
+video/x-ms-asx; totem %s; test=test -n "$DISPLAY"
+video/x-msvideo; totem %s; test=test -n "$DISPLAY"
+video/x-ms-wm; totem %s; test=test -n "$DISPLAY"
+video/x-ms-wmv; totem %s; test=test -n "$DISPLAY"
+video/x-ms-wmx; totem %s; test=test -n "$DISPLAY"
+video/x-ms-wvx; totem %s; test=test -n "$DISPLAY"
+video/x-nsv; totem %s; test=test -n "$DISPLAY"
+video/x-ogm+ogg; totem %s; test=test -n "$DISPLAY"
+video/x-theora; totem %s; test=test -n "$DISPLAY"
+video/x-theora+ogg; totem %s; test=test -n "$DISPLAY"
+video/x-totem-stream; totem %s; test=test -n "$DISPLAY"
+audio/x-pn-realaudio; totem %s; test=test -n "$DISPLAY"
+application/smil; totem %s; test=test -n "$DISPLAY"
+application/smil+xml; totem %s; test=test -n "$DISPLAY"
+application/x-quicktime-media-link; totem %s; test=test -n "$DISPLAY"
+application/x-smil; totem %s; test=test -n "$DISPLAY"
+text/google-video-pointer; totem %s; test=test -n "$DISPLAY"
+x-content/video-dvd; totem %s; test=test -n "$DISPLAY"
+x-scheme-handler/pnm; totem %s; test=test -n "$DISPLAY"
+x-scheme-handler/mms; totem %s; test=test -n "$DISPLAY"
+x-scheme-handler/net; totem %s; test=test -n "$DISPLAY"
+x-scheme-handler/rtp; totem %s; test=test -n "$DISPLAY"
+x-scheme-handler/rtmp; totem %s; test=test -n "$DISPLAY"
+x-scheme-handler/rtsp; totem %s; test=test -n "$DISPLAY"
+x-scheme-handler/mmsh; totem %s; test=test -n "$DISPLAY"
+x-scheme-handler/uvox; totem %s; test=test -n "$DISPLAY"
+x-scheme-handler/icy; totem %s; test=test -n "$DISPLAY"
+x-scheme-handler/icyx; totem %s; test=test -n "$DISPLAY"
+application/x-k3b; k3b %s; test=test -n "$DISPLAY"
+application/x-iso; k3b %s; test=test -n "$DISPLAY"
+application/x-cd-image; k3b %s; test=test -n "$DISPLAY"
+application/x-cue; k3b %s; test=test -n "$DISPLAY"
+x-content/blank-cd; k3b %s; test=test -n "$DISPLAY"
+x-content/blank-dvd; k3b %s; test=test -n "$DISPLAY"
+x-content/blank-bd; k3b %s; test=test -n "$DISPLAY"
+x-content/blank-hddvd; k3b %s; test=test -n "$DISPLAY"
+application/x-k3b; k3b %s; test=test -n "$DISPLAY"
  application/x-go-sgf; kigo %s -qwindowicon kigo -qwindowtitle Kigo; test=test -n "$DISPLAY"
  inode/vnd.kde.service.knavalbattle; knavalbattle -qwindowtitle Naval Battle %s; test=test -n "$DISPLAY"
  application/x-kourse; kolf %s; test=test -n "$DISPLAY"
@@ -925,6 +867,7 @@ application/x-palapeli-puzzle; palapeli %s; test=test -n "$DISPLAY"
  application/x-keepass2; keepassxc %s; test=test -n "$DISPLAY"
  x-content/image-dcf; pix --import-photos %s; test=test -n "$DISPLAY"
  x-content/image-picturecd; pix --import-photos %s; test=test -n "$DISPLAY"
+x-scheme-handler/geo; kde-geo-uri-handler --coordinate-template "https://www.qwant.com/maps/#map=<Z>/<LAT>/<LON>" --query-template "https://www.qwant.com/maps/?q=<Q>&client=opensearch" --fallback "https://www.qwant.com/maps/" %s; test=test -n "$DISPLAY"
  x-scheme-handler/spice; remote-viewer %s; test=test -n "$DISPLAY"
  application/x-virt-viewer; remote-viewer %s; test=test -n "$DISPLAY"
  x-content/audio-player; rhythmbox-client --select-source %s; test=test -n "$DISPLAY"
@@ -986,16 +929,16 @@ image/x-srf; shotwell %s; test=test -n "$DISPLAY"
  image/x-x3f; shotwell %s; test=test -n "$DISPLAY"
  x-content/image-dcf; shotwell %s; test=test -n "$DISPLAY"
  x-scheme-handler/snap; /usr/bin/snap handle-link %s; test=test -n "$DISPLAY"
-x-scheme-handler/steam; steam steam://open/friends %s; test=test -n "$DISPLAY"
-x-scheme-handler/msteams; /usr/bin/teams --quit %s; test=test -n "$DISPLAY"
-x-scheme-handler/mailto; thunderbird -addressbook %s; test=test -n "$DISPLAY"
-application/x-xpinstall; thunderbird -addressbook %s; test=test -n "$DISPLAY"
-x-scheme-handler/webcal; thunderbird -addressbook %s; test=test -n "$DISPLAY"
-x-scheme-handler/mid; thunderbird -addressbook %s; test=test -n "$DISPLAY"
-message/rfc822; thunderbird -addressbook %s; test=test -n "$DISPLAY"
-text/uri-list; variety --preferences %s; test=test -n "$DISPLAY"
-x-scheme-handler/variety; variety --preferences %s; test=test -n "$DISPLAY"
-x-scheme-handler/vrty; variety --preferences %s; test=test -n "$DISPLAY"
+x-scheme-handler/steam; sh -c 'STEAM_FRAME_FORCE_CLOSE=1 steam' %s; test=test -n "$DISPLAY"
+x-scheme-handler/msteams; teams %s; test=test -n "$DISPLAY"
+x-scheme-handler/mailto; thunderbird %s; test=test -n "$DISPLAY"
+application/x-xpinstall; thunderbird %s; test=test -n "$DISPLAY"
+x-scheme-handler/webcal; thunderbird %s; test=test -n "$DISPLAY"
+x-scheme-handler/mid; thunderbird %s; test=test -n "$DISPLAY"
+message/rfc822; thunderbird %s; test=test -n "$DISPLAY"
+text/uri-list; variety %s; test=test -n "$DISPLAY"
+x-scheme-handler/variety; variety %s; test=test -n "$DISPLAY"
+x-scheme-handler/vrty; variety %s; test=test -n "$DISPLAY"
  text/english; vim %s; needsterminal
  text/plain; vim %s; needsterminal
  text/x-makefile; vim %s; needsterminal
@@ -1014,6 +957,7 @@ text/x-c++; vim %s; needsterminal
  application/x-vnc; vinagre -F %s; test=test -n "$DISPLAY"
  application/x-remote-connection; vinagre %s; test=test -n "$DISPLAY"
  x-scheme-handler/vnc; vinagre %s; test=test -n "$DISPLAY"
+x-scheme-handler/geo; kde-geo-uri-handler --coordinate-template "https://wheelmap.org/?lat=<LAT>&lon=<LON>" --query-template "https://wheelmap.org/search?q=<Q>" --fallback "https://wheelmap.org" %s; test=test -n "$DISPLAY"
  application/vnd.tcpdump.pcap; wireshark %s; test=test -n "$DISPLAY"
  application/x-pcapng; wireshark %s; test=test -n "$DISPLAY"
  application/x-snoop; wireshark %s; test=test -n "$DISPLAY"
@@ -1031,7 +975,7 @@ application/x-apple-packetlogger; wireshark %s; test=test -n "$DISPLAY"
  application/x-endace-erf; wireshark %s; test=test -n "$DISPLAY"
  application/ipfix; wireshark %s; test=test -n "$DISPLAY"
  application/x-ixia-vwr; wireshark %s; test=test -n "$DISPLAY"
-text/plain; xed --new-window %s; test=test -n "$DISPLAY"
+text/plain; xed %s; test=test -n "$DISPLAY"
  application/x-xpraconfig; xpra_launcher %s; test=test -n "$DISPLAY"
  x-scheme-handler/xpra; xpra attach %s; test=test -n "$DISPLAY"
  x-scheme-handler/xpras; xpra attach %s; test=test -n "$DISPLAY"
@@ -1113,34 +1057,35 @@ application/x-ogg; vlc %s; nametemplate=%s.ogg; description="Ogg stream"; test=t
  video/ogg; vlc %s; description="Ogg Video"; test=test -n "$DISPLAY"
  application/x-ms-asf-plugin; vlc %s; description="Windows Media Video"; test=test -n "$DISPLAY"
  application/x-mplayer2; vlc %s; description="Windows Media"; test=test -n "$DISPLAY"
-text/csv; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="CSV Document"; nametemplate=%s.csv
-text/spreadsheet; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Spreadsheet Interchange Document"; nametemplate=%s.slk
-application/x-quattropro; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Quattro Pro 6 for Windows Spreadsheet"; nametemplate=%s.wb2
-application/x-dbf; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="xBase Document"; nametemplate=%s.dbf
-application/vnd.ms-excel.sheet.macroEnabled.12; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet with Macros Enabled"; nametemplate=%s.xlsm
-application/vnd.ms-excel.template.macroEnabled.12; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet Template with Macros Enabled"; nametemplate=%s.xltm
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet"; nametemplate=%s.xlsx
-application/vnd.openxmlformats-officedocument.spreadsheetml.template; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet Template"; nametemplate=%s.xltx
-application/vnd.lotus-1-2-3; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Lotus 1-2-3 spreadsheet"; nametemplate=%s.123
-application/vnd.ms-excel; soffice --nologo --calc '%s'; edit=soffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Microsoft Excel Document"; nametemplate=%s.xls
-application/vnd.ms-powerpoint.presentation.macroEnabled.12; soffice --nologo --impress '%s'; edit=soffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation with Macros Enabled"; nametemplate=%s.pptm
-application/vnd.ms-powerpoint.slideshow.macroEnabled.12; soffice --nologo --impress '%s'; edit=soffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Slide Show with Macros Enabled"; nametemplate=%s.ppsm
-application/vnd.ms-powerpoint.template.macroEnabled.12; soffice --nologo --impress '%s'; edit=soffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Template with Macros Enabled"; nametemplate=%s.potm
-application/vnd.openxmlformats-officedocument.presentationml.presentation; soffice --nologo --impress '%s'; edit=soffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation"; nametemplate=%s.pptx
-application/vnd.openxmlformats-officedocument.presentationml.slideshow; soffice --nologo --impress '%s'; edit=soffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Slide Show"; nametemplate=%s.ppsx
-application/vnd.openxmlformats-officedocument.presentationml.template; soffice --nologo --impress '%s'; edit=soffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Template"; nametemplate=%s.potx
-application/vnd.ms-powerpoint; soffice --nologo --impress '%s'; edit=soffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Microsoft PowerPoint Document"; nametemplate=%s.ppt
-text/mathml; soffice --nologo --math '%s'; edit=soffice --nologo --math '%s'; test=test -n "$DISPLAY"; description="MathML Formula"; nametemplate=%s.mml
-application/rtf; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Rich Text Format"; nametemplate=%s.rtf
-application/x-extension-txt; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Plain Text Document"; nametemplate=%s.txt
-application/x-t602; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="T602 Document"; nametemplate=%s.602
-application/vnd.wordperfect; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="WordPerfect Document"; nametemplate=%s.wp
-application/vnd.ms-word.document.macroEnabled.12; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document with Macros Enabled"; nametemplate=%s.docm
-application/vnd.ms-word.template.macroEnabled.12; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document Template with Macros Enabled"; nametemplate=%s.dotm
-application/vnd.openxmlformats-officedocument.wordprocessingml.document; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document"; nametemplate=%s.docx
-application/vnd.openxmlformats-officedocument.wordprocessingml.template; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document Template"; nametemplate=%s.dotx
-application/msword; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Microsoft Word Document"; nametemplate=%s.doc
-application/vnd.ms-works; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Microsoft Works Document"; nametemplate=%s.wps
+text/csv; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; test=test -n "$DISPLAY"; description="CSV Document"; nametemplate=%s.csv
+text/spreadsheet; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; test=test -n "$DISPLAY"; description="Spreadsheet Interchange Document"; nametemplate=%s.slk
+application/x-quattropro; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; test=test -n "$DISPLAY"; description="Quattro Pro 6 for Windows Spreadsheet"; nametemplate=%s.wb2
+application/x-dbf; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; test=test -n "$DISPLAY"; description="xBase Document"; nametemplate=%s.dbf
+application/vnd.ms-excel.sheet.macroEnabled.12; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet with Macros Enabled"; nametemplate=%s.xlsm
+application/vnd.ms-excel.template.macroEnabled.12; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet Template with Macros Enabled"; nametemplate=%s.xltm
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet"; nametemplate=%s.xlsx
+application/vnd.openxmlformats-officedocument.spreadsheetml.template; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet Template"; nametemplate=%s.xltx
+application/vnd.lotus-1-2-3; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; test=test -n "$DISPLAY"; description="Lotus 1-2-3 spreadsheet"; nametemplate=%s.123
+application/vnd.ms-excel; soffice --nologo --calc %s; edit=soffice --nologo --calc %s; test=test -n "$DISPLAY"; description="Microsoft Excel Document"; nametemplate=%s.xls
+application/vnd.ms-powerpoint.presentation.macroEnabled.12; soffice --nologo --impress %s; edit=soffice --nologo --impress %s; test=test -n "$DISPLAY"; description="Office Open XML Presentation with Macros Enabled"; nametemplate=%s.pptm
+application/vnd.ms-powerpoint.slideshow.macroEnabled.12; soffice --nologo --impress %s; edit=soffice --nologo --impress %s; test=test -n "$DISPLAY"; description="Office Open XML Presentation Slide Show with Macros Enabled"; nametemplate=%s.ppsm
+application/vnd.ms-powerpoint.template.macroEnabled.12; soffice --nologo --impress %s; edit=soffice --nologo --impress %s; test=test -n "$DISPLAY"; description="Office Open XML Presentation Template with Macros Enabled"; nametemplate=%s.potm
+application/vnd.openxmlformats-officedocument.presentationml.presentation; soffice --nologo --impress %s; edit=soffice --nologo --impress %s; test=test -n "$DISPLAY"; description="Office Open XML Presentation"; nametemplate=%s.pptx
+application/vnd.openxmlformats-officedocument.presentationml.slideshow; soffice --nologo --impress %s; edit=soffice --nologo --impress %s; test=test -n "$DISPLAY"; description="Office Open XML Presentation Slide Show"; nametemplate=%s.ppsx
+application/vnd.openxmlformats-officedocument.presentationml.template; soffice --nologo --impress %s; edit=soffice --nologo --impress %s; test=test -n "$DISPLAY"; description="Office Open XML Presentation Template"; nametemplate=%s.potx
+application/vnd.ms-powerpoint; soffice --nologo --impress %s; edit=soffice --nologo --impress %s; test=test -n "$DISPLAY"; description="Microsoft PowerPoint Document"; nametemplate=%s.ppt
+text/mathml; soffice --nologo --math %s; edit=soffice --nologo --math %s; test=test -n "$DISPLAY"; description="MathML Formula"; nametemplate=%s.mml
+application/rtf; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; test=test -n "$DISPLAY"; description="Rich Text Format"; nametemplate=%s.rtf
+application/x-extension-txt; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; test=test -n "$DISPLAY"; description="Plain Text Document"; nametemplate=%s.txt
+application/x-t602; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; test=test -n "$DISPLAY"; description="T602 Document"; nametemplate=%s.602
+application/vnd.wordperfect; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; test=test -n "$DISPLAY"; description="WordPerfect Document"; nametemplate=%s.wp
+application/vnd.ms-word.document.macroEnabled.12; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; test=test -n "$DISPLAY"; description="Office Open XML Document with Macros Enabled"; nametemplate=%s.docm
+application/vnd.ms-word.template.macroEnabled.12; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; test=test -n "$DISPLAY"; description="Office Open XML Document Template with Macros Enabled"; nametemplate=%s.dotm
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; test=test -n "$DISPLAY"; description="Office Open XML Document"; nametemplate=%s.docx
+application/vnd.openxmlformats-officedocument.wordprocessingml.template; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; test=test -n "$DISPLAY"; description="Office Open XML Document Template"; nametemplate=%s.dotx
+application/msword; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; test=test -n "$DISPLAY"; description="Microsoft Word Document"; nametemplate=%s.doc
+application/vnd.ms-works; soffice --nologo --writer %s; edit=soffice --nologo --writer %s; test=test -n "$DISPLAY"; description="Microsoft Works Document"; nametemplate=%s.wps
+application/zip; unzip -l %s; nametemplate=%s.zip; copiousoutput
  application/zip; unzip -l %s; nametemplate=%s.zip; copiousoutput
  text/plain; view %s; edit=vi %s; compose=vi %s; needsterminal
  video/x-msvideo; vlc -I rc -V caca %s; needsterminal; description="MS Video (AVI)"
@@ -1201,15 +1146,15 @@ image/x-xpixmap; display-im6.q16 'xpm:%s'; test=test -n "$DISPLAY"
  image/x-xwindowdump; display-im6.q16 'xwd:%s'; test=test -n "$DISPLAY"
  image/x-icon; display-im6.q16 'icon:%s'; test=test -n "$DISPLAY"
  image/yuv; display-im6.q16 'yuv:%s'; test=test -n "$DISPLAY"
-application/x-troff-man; /usr/bin/man -Tascii -l '%s' | col -b; copiousoutput; description=Man page
-text/troff; /usr/bin/man -Tascii -l '%s' | col -b; copiousoutput; description=Man page
-text/*; less '%s'; needsterminal
+application/x-troff-man; /usr/bin/man -Tascii -l %s | col -b; copiousoutput; description=Man page
+text/troff; /usr/bin/man -Tascii -l %s | col -b; copiousoutput; description=Man page
+text/*; less %s; needsterminal
  text/*; view %s; edit=vim %s; compose=vim %s; test=test -x /usr/bin/vim; needsterminal
  text/*; gview -f %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""
  application/x-info; /usr/bin/info --subnodes -o /dev/stdout -f '%s' 2>/dev/null; copiousoutput; description=GNU Info document
-application/x-tar; /bin/tar tvf '%s'; print=/bin/tar tvf - | print text/plain:-; copiousoutput
-application/x-gtar; /bin/tar tvf '%s'; print=/bin/tar tvf - | print text/plain:-; copiousoutput
-application/x-ustar; /bin/tar tvf '%s'; print=/bin/tar tvf - | print text/plain:-; copiousoutput
+application/x-tar; /bin/tar tvf %s; print=/bin/tar tvf - | print text/plain:-; copiousoutput
+application/x-gtar; /bin/tar tvf %s; print=/bin/tar tvf - | print text/plain:-; copiousoutput
+application/x-ustar; /bin/tar tvf %s; print=/bin/tar tvf - | print text/plain:-; copiousoutput
  text/*; more %s; needsterminal
  text/*; view %s; edit=vi %s; compose=vi %s; needsterminal
  application/vnd.debian.binary-package; /usr/lib/mime/debian-view %s; needsterminal; description=Debian GNU/Linux Package; nametemplate=%s.deb
diff --git a/menu-methods/menu-xdg b/menu-methods/menu-xdg

old mode 100755 (executable)

new mode 100644 (file)
diff --git a/menu-methods/xdg-desktop-entry-spec-apps b/menu-methods/xdg-desktop-entry-spec-apps

old mode 100755 (executable)

new mode 100644 (file)
diff --git a/menu-methods/xdg-desktop-entry-spec-dirs b/menu-methods/xdg-desktop-entry-spec-dirs

old mode 100755 (executable)

new mode 100644 (file)
diff --git a/menu-methods/xdg-desktop-entry-spec-sessions b/menu-methods/xdg-desktop-entry-spec-sessions

old mode 100755 (executable)

new mode 100644 (file)
diff --git a/mime.types b/mime.types

index 8e26dee9ddb419a123d25fb350e95dca091c8ddb..e7e339a785d5c2dba6907e31508ac692453003f8 100644 (file)
--- a/mime.types
+++ b/mime.types
@@ -1,16 +1,16 @@
  ###############################################################################
  #
-#  MIME media types and the extensions that represent them.
+#  Media (MIME) types and the extensions that represent them.
  #
  #  The format of this file is a media type on the left and zero or more
  #  filename extensions on the right.  Programs using this file will map
  #  files ending with those extensions to the associated type.
  #
-#  This file is part of the "mime-support" package.  Please report a bug using
+#  This file is part of the "media-types" package.  Please report a bug using
  #  the "reportbug" command of the "reportbug" package if you would like new
  #  types or extensions to be added.
  #
-#  The reason that all types are managed by the mime-support package instead
+#  The reason that all types are managed by the media-types package instead
  #  allowing individual packages to install types in much the same way as they
  #  add entries in to the mailcap file is so these types can be referenced by
  #  other programs (such as a web server) even if the specific support package
@@ -22,214 +22,871 @@
  #
  ###############################################################################
  
-
+application/1d-interleaved-parityfec
+application/3gpdash-qoe-report+xml
+application/3gpp-ims+xml
+application/3gppHal+json
+application/3gppHalForms+json
+application/A2L                                        a2l
+application/ace+cbor
  application/activemessage
+application/activity+json
+application/alto-cdni+json
+application/alto-cdnifilter+json
+application/alto-costmap+json
+application/alto-costmapfilter+json
+application/alto-directory+json
+application/alto-endpointcost+json
+application/alto-endpointcostparams+json
+application/alto-endpointprop+json
+application/alto-endpointpropparams+json
+application/alto-error+json
+application/alto-networkmap+json
+application/alto-networkmapfilter+json
+application/alto-propmap+json
+application/alto-propmapparams+json
+application/alto-updatestreamcontrol+json
+application/alto-updatestreamparams+json
+application/AML                                        aml
  application/andrew-inset                       ez
  application/annodex                            anx
  application/applefile
+application/at+jwt
+application/ATF                                        atf
+application/ATFX                               atfx
  application/atom+xml                           atom
  application/atomcat+xml                                atomcat
+application/atomdeleted+xml                    atomdeleted
  application/atomicmail
  application/atomserv+xml                       atomsrv
+application/atomsvc+xml                                atomsvc
+application/atsc-dwd+xml                       dwd
+application/atsc-dynamic-event-message
+application/atsc-held+xml                      held
+application/atsc-rdt+json
+application/atsc-rsat+xml                      rsat
+application/ATXML                              atxml
+application/auth-policy+xml                    apxml
+application/bacnet-xdd+zip                     xdd
  application/batch-SMTP
  application/bbolin                             lin
  application/beep+xml
-application/cals-1840
+application/calendar+json
+application/calendar+xml                       xcs
+application/call-completion
+application/CALS-1840
+application/captive+json
+application/cbor                               cbor
+application/cbor-seq
+application/cccex                              c3ex
+application/ccmp+xml                           ccmp
+application/ccxml+xml                          ccxml
+application/CDFX+XML                           cdfx
+application/cdmi-capability                    cdmia
+application/cdmi-container                     cdmic
+application/cdmi-domain                                cdmid
+application/cdmi-object                                cdmio
+application/cdmi-queue                         cdmiq
+application/cdni
+application/CEA                                        cea
+application/cea-2018+xml
+application/cellml+xml                         cellml cml
+application/cfw
+application/city+json
+application/clr                                        1clr
+application/clue+xml
+application/clue_info+xml                      clue
+application/cms                                        cmsc
+application/cnrp+xml
+application/coap-group+json
+application/coap-payload
  application/commonground
+application/conference-info+xml
+application/cose
+application/cose-key
+application/cose-key-set
+application/cpl+xml                            cpl
+application/csrattrs                           csrattrs
+application/csta+xml
+application/CSTAdata+xml
+application/csvm+json
  application/cu-seeme                           cu
+application/cwt
  application/cybercash
+application/dash+xml                           mpd
+application/dash-patch+xml
+application/dashdelta                          mpdd
  application/davmount+xml                       davmount
  application/dca-rft
+application/DCD                                        dcd
  application/dec-dx
+application/dialog-info+xml
  application/dicom                              dcm
-application/docbook+xml
+application/dicom+json
+application/dicom+xml
+application/DII                                        dii
+application/DIT                                        dit
+application/dns
+application/dns+json
+application/dns-message
+application/dots+cbor
+application/dskpp+xml                          xmls
  application/dsptype                            tsp
-application/dvcs
-application/ecmascript                         es
-application/edi-consent
-application/edi-x12
-application/edifact
+application/dssc+der                           dssc
+application/dssc+xml                           xdssc
+application/dvcs                               dvc
+application/EDI-consent
+application/EDI-X12
+application/EDIFACT
+application/efi                                        efi
+application/elm+json
+application/elm+xml
+application/EmergencyCallData.cap+xml
+application/EmergencyCallData.Comment+xml
+application/EmergencyCallData.Control+xml
+application/EmergencyCallData.DeviceInfo+xml
+application/EmergencyCallData.eCall.MSD
+application/EmergencyCallData.ProviderInfo+xml
+application/EmergencyCallData.ServiceInfo+xml
+application/EmergencyCallData.SubscriberInfo+xml
+application/EmergencyCallData.VEDS+xml
+application/emma+xml                           emma
+application/emotionml+xml                      emotionml
+application/encaprtp
+application/epp+xml
  application/epub+zip                           epub
  application/eshop
-application/font-sfnt                          otf ttf
+application/example
+application/exi                                        exi
+application/expect-ct-report+json
+application/express                            exp
+application/fastinfoset                                finf
+application/fastsoap
+application/fdt+xml                            fdt
+application/fhir+json
+application/fhir+xml
+application/fits
+application/flexfec
  application/font-tdpfr                         pfr
-application/font-woff                          woff
+application/framework-attributes+xml
  application/futuresplash                       spl
-application/ghostview
+application/geo+json                           geojson
+application/geo+json-seq
+application/geopackage+sqlite3                 gpkg
+application/geoxacml+xml
+application/gltf-buffer                                glbin glbuf
+application/gml+xml                            gml
  application/gzip                               gz
+application/H224
+application/held+xml
  application/hta                                        hta
  application/http
-application/hyperstudio
+application/hyperstudio                                stk
+application/ibe-key-request+xml
+application/ibe-pkg-reply+xml
+application/ibe-pp-data
  application/iges
+application/im-iscomposing+xml
  application/index
  application/index.cmd
  application/index.obj
  application/index.response
  application/index.vnd
-application/iotp
+application/inkml+xml                          ink inkml
+application/IOTP
+application/ipfix                              ipfix
  application/ipp
-application/isup
+application/ISUP
+application/its+xml                            its
  application/java-archive                       jar
  application/java-serialized-object             ser
  application/java-vm                            class
-application/javascript                         js mjs
+application/jf2feed+json
+application/jose
+application/jose+json
+application/jrd+json                           jrd
+application/jscalendar+json
  application/json                               json
+application/json-patch+json                    json-patch
+application/json-seq
+application/jwk+json
+application/jwk-set+json
+application/jwt
+application/kpml-request+xml
+application/kpml-response+xml
  application/ld+json                            jsonld
+application/lgr+xml                            lgr
+application/link-format                                wlnk
+application/load-control+xml
+application/lost+xml                           lostxml
+application/lostsync+xml                       lostsyncxml
+application/lpf+zip                            lpf
+application/LXF                                        lxf
  application/m3g                                        m3g
  application/mac-binhex40                       hqx
  application/mac-compactpro                     cpt
  application/macwriteii
-application/marc
-application/mathematica                                nb nbp
+application/mads+xml                           mads
+application/manifest+json                      webmanifest
+application/marc                               mrc
+application/marcxml+xml                                mrcx
+application/mathematica                                ma mb
+application/mathml+xml                         mml
+application/mathml-content+xml
+application/mathml-presentation+xml
+application/mbms-associated-procedure-description+xml
+application/mbms-deregister+xml
+application/mbms-envelope+xml
+application/mbms-msk+xml
+application/mbms-msk-response+xml
+application/mbms-protection-description+xml
+application/mbms-reception-report+xml
+application/mbms-register+xml
+application/mbms-register-response+xml
+application/mbms-schedule+xml
+application/mbms-user-service-description+xml
  application/mbox                               mbox
-application/ms-tnef
+application/media-policy-dataset+xml
+application/mediaservercontrol+xml
+application/media_control+xml
+application/merge-patch+json
+application/metalink4+xml                      meta4
+application/mets+xml                           mets
+application/MF4                                        mf4
+application/mikey
+application/mipc
+application/missing-blocks+cbor-seq
+application/mmt-aei+xml                                maei
+application/mmt-usd+xml                                musd
+application/mods+xml                           mods
+application/moss-keys
+application/moss-signature
+application/mosskey-data
+application/mosskey-request
+application/mp21                               m21 mp21
+application/mp4
+application/mpeg4-generic
+application/mpeg4-iod
+application/mpeg4-iod-xmt
+application/mrb-consumer+xml
+application/mrb-publish+xml
  application/msaccess                           mdb
-application/msword                             doc dot
+application/msc-ivr+xml
+application/msc-mixer+xml
+application/msword                             doc
+application/mud+json
+application/multipart-core
  application/mxf                                        mxf
-application/news-message-id
+application/n-quads                            nq
+application/n-triples                          nt
+application/nasdata
+application/news-checkgroups
+application/news-groupinfo
  application/news-transmission
-application/ocsp-request
-application/ocsp-response
+application/nlsml+xml
+application/node
+application/nss
+application/oauth-authz-req+jwt
+application/oblivious-dns-message
+application/ocsp-request                       orq
+application/ocsp-response                      ors
  application/octet-stream                       bin deploy msu msp
-application/oda                                        oda
+application/ODA                                        oda
+application/odm+xml
+application/ODX                                        odx
  application/oebps-package+xml                  opf
  application/ogg                                        ogx
  application/onenote                            one onetoc2 onetmp onepkg
+application/opc-nodeset+xml
+application/oscore
+application/oxps                               oxps
+application/p21                                        p21 stpnc 210 ifc
+application/p21+zip
+application/p2p-overlay+xml                    relo
  application/parityfec
+application/passport
+application/patch-ops-error+xml
  application/pdf                                        pdf
+application/PDX                                        pdx
+application/pem-certificate-chain              pem
  application/pgp-encrypted                      pgp
-application/pgp-keys                           key
+application/pgp-keys                           asc key
  application/pgp-signature                      sig
  application/pics-rules                         prf
-application/pkcs10
-application/pkcs7-mime
-application/pkcs7-signature
-application/pkix-cert
-application/pkix-crl
-application/pkixcmp
+application/pidf+xml
+application/pidf-diff+xml
+application/pkcs10                             p10
+application/pkcs12                             p12 pfx
+application/pkcs7-mime                         p7m p7c p7z
+application/pkcs7-signature                    p7s
+application/pkcs8                              p8
+application/pkcs8-encrypted                    p8e
+application/pkix-attr-cert                     ac
+application/pkix-cert                          cer
+application/pkix-crl                           crl
+application/pkix-pkipath                       pkipath
+application/pkixcmp                            pki
+application/pls+xml
+application/poc-settings+xml
  application/postscript                         ps ai eps epsi epsf eps2 eps3
+application/ppsp-tracker+json
+application/problem+json
+application/problem+xml
+application/provenance+xml                     provx
  application/prs.alvestrand.titrax-sheet
-application/prs.cww
-application/prs.nprend
-application/qsig
-application/rar                                        rar
+application/prs.cww                            cw cww
+application/prs.cyn
+application/prs.hpub+zip                       hpub
+application/prs.nprend                         rnd rct
+application/prs.plucker
+application/prs.rdf-xml-crypt                  rdf-crypt
+application/prs.xsf+xml                                xsf
+application/pskc+xml                           pskcxml
+application/pvd+json
+application/QSIG
+application/raptorfec
+application/rdap+json
  application/rdf+xml                            rdf
+application/reginfo+xml                                rif
+application/relax-ng-compact-syntax            rnc
  application/remote-printing
+application/reputon+json
+application/resource-lists+xml                 rl
+application/resource-lists-diff+xml            rld
+application/rfc+xml                            rfcxml
  application/riscos
+application/rlmi+xml
+application/rls-services+xml                   rs
+application/route-apd+xml                      rapd
+application/route-s-tsid+xml                   sls
+application/route-usd+xml                      rusd
+application/rpki-ghostbusters                  gbr
+application/rpki-manifest                      mft
+application/rpki-publication
+application/rpki-roa                           roa
+application/rpki-updown
  application/rtf                                        rtf
-application/sdp
+application/rtploopback
+application/rtx
+application/samlassertion+xml
+application/samlmetadata+xml
+application/sarif+json                         sarif sarif.json
+application/sarif-external-properties+json     sarif-external-properties sarif-external-properties.json
+application/sbe
+application/sbml+xml
+application/scaip+xml
+application/scim+json                          scim
+application/scvp-cv-request                    scq
+application/scvp-cv-response                   scs
+application/scvp-vp-request                    spq
+application/scvp-vp-response                   spp
+application/sdp                                        sdp
+application/secevent+jwt
+application/senml+cbor                         senmlc
+application/senml+json                         senml
+application/senml+xml                          senmlx
+application/senml-etch+cbor                    senml-etchc
+application/senml-etch+json                    senml-etchj
+application/senml-exi                          senmle
+application/sensml+cbor                                sensmlc
+application/sensml+json                                sensml
+application/sensml+xml                         sensmlx
+application/sensml-exi                         sensmle
+application/sep+xml
+application/sep-exi
+application/session-info
  application/set-payment
  application/set-payment-initiation
  application/set-registration
  application/set-registration-initiation
-application/sgml
-application/sgml-open-catalog
-application/sieve
-application/sla                                        stl
+application/SGML
+application/sgml-open-catalog                  soc
+application/shf+xml                            shf
+application/sieve                              siv sieve
+application/simple-filter+xml                  cl
+application/simple-message-summary
+application/simpleSymbolContainer
+application/sipc
  application/slate
-application/smil+xml                           smi smil
-application/timestamp-query
-application/timestamp-reply
+application/smil+xml                           smil smi sml
+application/smpte336m
+application/soap+fastinfoset
+application/soap+xml
+application/sparql-query                       rq
+application/sparql-results+xml                 srx
+application/spdx+json                          spdx.json
+application/spirits-event+xml
+application/sql                                        sql
+application/srgs                               gram
+application/srgs+xml                           grxml
+application/sru+xml                            sru
+application/ssml+xml                           ssml
+application/stix+json                          stix
+application/swid+xml                           swidtag
+application/tamp-apex-update                   tau
+application/tamp-apex-update-confirm           auc
+application/tamp-community-update              tcu
+application/tamp-community-update-confirm      cuc
+application/tamp-error                         ter
+application/tamp-sequence-adjust               tsa
+application/tamp-sequence-adjust-confirm       sac
+application/tamp-status-query
+application/tamp-status-response
+application/tamp-update                                tur
+application/tamp-update-confirm                        tuc
+application/taxii+json
+application/td+json                            jsontd
+application/tei+xml                            tei teiCorpus odd
+application/TETRA_ISI
+application/thraud+xml                         tfi
+application/timestamp-query                    tsq
+application/timestamp-reply                    tsr
+application/timestamped-data                   tsd
+application/tlsrpt+gzip
+application/tlsrpt+json
+application/tnauthlist
+application/token-introspection+jwt
+application/trickle-ice-sdpfrag
+application/trig                               trig
+application/ttml+xml                           ttml
+application/tve-trigger
+application/tzif
+application/tzif-leap
+application/ulpfec
+application/urc-grpsheet+xml                   gsheet
+application/urc-ressheet+xml                   rsheet
+application/urc-targetdesc+xml                 td
+application/urc-uisocketdesc+xml               uis
+application/vcard+json
+application/vcard+xml
  application/vemmi
-application/wasm                                wasm
-application/whoispp-query
-application/whoispp-response
-application/wita
-application/x400-bp
-application/xhtml+xml                          xhtml xht
-application/xml                                        xml xsd
-application/xml-dtd
-application/xml-external-parsed-entity
-application/xslt+xml                           xsl xslt
-application/xspf+xml                           xspf
-application/zip                                        zip
-application/vnd.3M.Post-it-Notes
-application/vnd.accpac.simply.aso
-application/vnd.accpac.simply.imp
-application/vnd.acucobol
+application/vnd.1000minds.decision-model+xml   1km
+application/vnd.3gpp-prose+xml
+application/vnd.3gpp-prose-pc3ch+xml
+application/vnd.3gpp-v2x-local-service-information
+application/vnd.3gpp.5gnas
+application/vnd.3gpp.access-transfer-events+xml
+application/vnd.3gpp.bsf+xml
+application/vnd.3gpp.GMOP+xml
+application/vnd.3gpp.gtpc
+application/vnd.3gpp.interworking-data
+application/vnd.3gpp.lpp
+application/vnd.3gpp.mc-signalling-ear
+application/vnd.3gpp.mcdata-affiliation-command+xml
+application/vnd.3gpp.mcdata-info+xml
+application/vnd.3gpp.mcdata-payload
+application/vnd.3gpp.mcdata-service-config+xml
+application/vnd.3gpp.mcdata-signalling
+application/vnd.3gpp.mcdata-ue-config+xml
+application/vnd.3gpp.mcdata-user-profile+xml
+application/vnd.3gpp.mcptt-affiliation-command+xml
+application/vnd.3gpp.mcptt-floor-request+xml
+application/vnd.3gpp.mcptt-info+xml
+application/vnd.3gpp.mcptt-location-info+xml
+application/vnd.3gpp.mcptt-mbms-usage-info+xml
+application/vnd.3gpp.mcptt-service-config+xml
+application/vnd.3gpp.mcptt-signed+xml
+application/vnd.3gpp.mcptt-ue-config+xml
+application/vnd.3gpp.mcptt-ue-init-config+xml
+application/vnd.3gpp.mcptt-user-profile+xml
+application/vnd.3gpp.mcvideo-affiliation-command+xml
+application/vnd.3gpp.mcvideo-info+xml
+application/vnd.3gpp.mcvideo-location-info+xml
+application/vnd.3gpp.mcvideo-mbms-usage-info+xml
+application/vnd.3gpp.mcvideo-service-config+xml
+application/vnd.3gpp.mcvideo-transmission-request+xml
+application/vnd.3gpp.mcvideo-ue-config+xml
+application/vnd.3gpp.mcvideo-user-profile+xml
+application/vnd.3gpp.mid-call+xml
+application/vnd.3gpp.ngap
+application/vnd.3gpp.pfcp
+application/vnd.3gpp.pic-bw-large              plb
+application/vnd.3gpp.pic-bw-small              psb
+application/vnd.3gpp.pic-bw-var                        pvb
+application/vnd.3gpp.s1ap
+application/vnd.3gpp.sms
+application/vnd.3gpp.sms+xml
+application/vnd.3gpp.srvcc-ext+xml
+application/vnd.3gpp.SRVCC-info+xml
+application/vnd.3gpp.state-and-event-info+xml
+application/vnd.3gpp.ussd+xml
+application/vnd.3gpp2.bcmcsinfo+xml
+application/vnd.3gpp2.sms                      sms
+application/vnd.3gpp2.tcap                     tcap
+application/vnd.3lightssoftware.imagescal      imgcal
+application/vnd.3M.Post-it-Notes               pwn
+application/vnd.accpac.simply.aso              aso
+application/vnd.accpac.simply.imp              imp
+application/vnd.acucobol                       acu
+application/vnd.acucorp                                atc acutc
+application/vnd.adobe.flash.movie              swf
+application/vnd.adobe.formscentral.fcdt                fcdt
+application/vnd.adobe.fxp                      fxp fxpl
+application/vnd.adobe.partial-upload
+application/vnd.adobe.xdp+xml                  xdp
+application/vnd.adobe.xfdf                     xfdf
  application/vnd.aether.imp
+application/vnd.afpc.afplinedata
+application/vnd.afpc.afplinedata-pagedef
+application/vnd.afpc.cmoca-cmresource
+application/vnd.afpc.foca-charset
+application/vnd.afpc.foca-codedfont
+application/vnd.afpc.foca-codepage
+application/vnd.afpc.modca                     list3820 listafp afp pseg3820
+application/vnd.afpc.modca-formdef
+application/vnd.afpc.modca-mediummap
+application/vnd.afpc.modca-objectcontainer
+application/vnd.afpc.modca-overlay             ovl
+application/vnd.afpc.modca-pagesegment         psg
+application/vnd.age                            age
+application/vnd.ah-barcode
+application/vnd.ahead.space                    ahead
+application/vnd.airzip.filesecure.azf          azf
+application/vnd.airzip.filesecure.azs          azs
+application/vnd.amadeus+json
+application/vnd.amazon.mobi8-ebook             azw3
+application/vnd.americandynamics.acc           acc
+application/vnd.amiga.ami                      ami
+application/vnd.amundsen.maze+xml
+application/vnd.android.ota                    ota
  application/vnd.android.package-archive                                                apk
-application/vnd.anser-web-certificate-issue-initiation
-application/vnd.anser-web-funds-transfer-initiation
-application/vnd.audiograph
-application/vnd.bmi
-application/vnd.businessobjects
+application/vnd.anki                           apkg
+application/vnd.anser-web-certificate-issue-initiation cii
+application/vnd.anser-web-funds-transfer-initiation    fti
+application/vnd.antix.game-component
+application/vnd.apache.arrow.file              arrow
+application/vnd.apache.arrow.stream            arrows
+application/vnd.apache.thrift.binary
+application/vnd.apache.thrift.compact
+application/vnd.apache.thrift.json
+application/vnd.api+json
+application/vnd.aplextor.warrp+json
+application/vnd.apothekende.reservation+json
+application/vnd.apple.installer+xml            dist distz pkg mpkg
+application/vnd.apple.keynote                  keynote
+application/vnd.apple.mpegurl                  m3u8
+application/vnd.apple.numbers                  numbers
+application/vnd.apple.pages                    pages
+application/vnd.aristanetworks.swi             swi
+application/vnd.artisan+json                   artisan
+application/vnd.artsquare
+application/vnd.astraea-software.iota          iota
+application/vnd.audiograph                     aep
+application/vnd.autopackage                    package
+application/vnd.avalon+json
+application/vnd.avistar+xml
+application/vnd.balsamiq.bmml+xml              bmml
+application/vnd.balsamiq.bmpr                  bmpr
+application/vnd.banana-accounting              ac2
+application/vnd.bbf.usp.error
+application/vnd.bbf.usp.msg
+application/vnd.bbf.usp.msg+json
+application/vnd.bekitzur-stech+json
+application/vnd.bint.med-content
+application/vnd.biopax.rdf+xml
+application/vnd.blink-idb-value-wrapper
+application/vnd.blueice.multipass              mpm
+application/vnd.bluetooth.ep.oob               ep
+application/vnd.bluetooth.le.oob               le
+application/vnd.bmi                            bmi
+application/vnd.bpf
+application/vnd.bpf3
+application/vnd.businessobjects                        rep
+application/vnd.byu.uapi+json
+application/vnd.cab-jscript
  application/vnd.canon-cpdl
  application/vnd.canon-lips
-application/vnd.cinderella                                                     cdy
-application/vnd.claymore
-application/vnd.commerce-battelle
-application/vnd.commonspace
-application/vnd.comsocaller
-application/vnd.contact.cmsg
-application/vnd.cosmocaller
-application/vnd.ctc-posml
+application/vnd.capasystems-pg+json
+application/vnd.cendio.thinlinc.clientconf     tlclient
+application/vnd.century-systems.tcp_stream
+application/vnd.chemdraw+xml                   cdxml
+application/vnd.chess-pgn                      pgn
+application/vnd.chipnuts.karaoke-mmd           mmd
+application/vnd.ciedi
+application/vnd.cinderella                     cdy
+application/vnd.cirpack.isdn-ext
+application/vnd.citationstyles.style+xml       csl
+application/vnd.claymore                       cla
+application/vnd.cloanto.rp9                    rp9
+application/vnd.clonk.c4group                  c4g c4d c4f c4p c4u
+application/vnd.cluetrust.cartomobile-config   c11amc
+application/vnd.cluetrust.cartomobile-config-pkg       c11amz
+application/vnd.coffeescript                   coffee
+application/vnd.collabio.xodocuments.document  xodt
+application/vnd.collabio.xodocuments.document-template xott
+application/vnd.collabio.xodocuments.presentation      xodp
+application/vnd.collabio.xodocuments.presentation-template     xotp
+application/vnd.collabio.xodocuments.spreadsheet       xods
+application/vnd.collabio.xodocuments.spreadsheet-template      xots
+application/vnd.collection+json
+application/vnd.collection.doc+json
+application/vnd.collection.next+json
+application/vnd.comicbook+zip                  cbz
+application/vnd.comicbook-rar                  cbr
+application/vnd.commerce-battelle              icf icd ic0 ic1 ic2 ic3 ic4 ic5 ic6 ic7 ic8
+application/vnd.commonspace                    csp cst
+application/vnd.contact.cmsg                   cdbcmsg
+application/vnd.coreos.ignition+json           ign ignition
+application/vnd.cosmocaller                    cmc
+application/vnd.crick.clicker                  clkx
+application/vnd.crick.clicker.keyboard         clkk
+application/vnd.crick.clicker.palette          clkp
+application/vnd.crick.clicker.template         clkt
+application/vnd.crick.clicker.wordbank         clkw
+application/vnd.criticaltools.wbs+xml          wbs
+application/vnd.cryptii.pipe+json
+application/vnd.crypto-shade-file              ssvc
+application/vnd.cryptomator.encrypted          c9r c9s
+application/vnd.cryptomator.vault              cryptomator
+application/vnd.ctc-posml                      pml
+application/vnd.ctct.ws+xml
+application/vnd.cups-pdf
  application/vnd.cups-postscript
+application/vnd.cups-ppd                       ppd
  application/vnd.cups-raster
  application/vnd.cups-raw
+application/vnd.curl
+application/vnd.cyan.dean.root+xml
  application/vnd.cybank
-application/vnd.debian.binary-package                                          deb ddeb udeb
-application/vnd.dna
-application/vnd.dpgraph
+application/vnd.cyclonedx+json
+application/vnd.cyclonedx+xml
+application/vnd.d2l.coursepackage1p0+zip
+application/vnd.d3m-dataset
+application/vnd.d3m-problem
+application/vnd.dart                           dart
+application/vnd.data-vision.rdz                        rdz
+application/vnd.datapackage+json
+application/vnd.dataresource+json
+application/vnd.dbf                            dbf
+application/vnd.debian.binary-package          deb ddeb udeb
+application/vnd.dece.data                      uvf uvvf uvd uvvd
+application/vnd.dece.ttml+xml                  uvt uvvt
+application/vnd.dece.unspecified               uvx uvvx
+application/vnd.dece.zip                       uvz uvvz
+application/vnd.denovo.fcselayout-link         fe_launch
+application/vnd.desmume.movie                  dsm
+application/vnd.dir-bi.plate-dl-nosuffix
+application/vnd.dm.delegation+xml
+application/vnd.dna                            dna
+application/vnd.document+json                  docjson
+application/vnd.dolby.mobile.1
+application/vnd.dolby.mobile.2
+application/vnd.doremir.scorecloud-binary-document     scld
+application/vnd.dpgraph                                dpg mwc dpgraph
+application/vnd.dreamfactory                   dfac
+application/vnd.drive+json
+application/vnd.dtg.local
+application/vnd.dtg.local.flash                        fla
+application/vnd.dtg.local.html
+application/vnd.dvb.ait                                ait
+application/vnd.dvb.dvbisl+xml
+application/vnd.dvb.dvbj
+application/vnd.dvb.esgcontainer
+application/vnd.dvb.ipdcdftnotifaccess
+application/vnd.dvb.ipdcesgaccess
+application/vnd.dvb.ipdcesgaccess2
+application/vnd.dvb.ipdcesgpdd
+application/vnd.dvb.ipdcroaming
+application/vnd.dvb.iptv.alfec-base
+application/vnd.dvb.iptv.alfec-enhancement
+application/vnd.dvb.notif-aggregate-root+xml
+application/vnd.dvb.notif-container+xml
+application/vnd.dvb.notif-generic+xml
+application/vnd.dvb.notif-ia-msglist+xml
+application/vnd.dvb.notif-ia-registration-request+xml
+application/vnd.dvb.notif-ia-registration-response+xml
+application/vnd.dvb.notif-init+xml
+application/vnd.dvb.pfr
+application/vnd.dvb.service                    svc
  application/vnd.dxr
+application/vnd.dynageo                                geo
+application/vnd.dzr                            dzr
+application/vnd.easykaraoke.cdgdownload
  application/vnd.ecdis-update
-application/vnd.ecowin.chart
+application/vnd.ecip.rlp
+application/vnd.eclipse.ditto+json
+application/vnd.ecowin.chart                   mag
  application/vnd.ecowin.filerequest
  application/vnd.ecowin.fileupdate
  application/vnd.ecowin.series
  application/vnd.ecowin.seriesrequest
  application/vnd.ecowin.seriesupdate
-application/vnd.enliven
-application/vnd.epson.esf
-application/vnd.epson.msf
-application/vnd.epson.quickanime
-application/vnd.epson.salt
-application/vnd.epson.ssf
-application/vnd.ericsson.quickcall
+application/vnd.efi.img
+application/vnd.efi.iso
+application/vnd.emclient.accessrequest+xml
+application/vnd.enliven                                nml
+application/vnd.enphase.envoy
+application/vnd.eprints.data+xml
+application/vnd.epson.esf                      esf
+application/vnd.epson.msf                      msf
+application/vnd.epson.quickanime               qam
+application/vnd.epson.salt                     slt
+application/vnd.epson.ssf                      ssf
+application/vnd.ericsson.quickcall             qcall qca
+application/vnd.espass-espass+zip              espass
+application/vnd.eszigno3+xml                   es3 et3
+application/vnd.etsi.aoc+xml
+application/vnd.etsi.asic-e+zip                        asice sce
+application/vnd.etsi.asic-s+zip                        asics
+application/vnd.etsi.cug+xml
+application/vnd.etsi.iptvcommand+xml
+application/vnd.etsi.iptvdiscovery+xml
+application/vnd.etsi.iptvprofile+xml
+application/vnd.etsi.iptvsad-bc+xml
+application/vnd.etsi.iptvsad-cod+xml
+application/vnd.etsi.iptvsad-npvr+xml
+application/vnd.etsi.iptvservice+xml
+application/vnd.etsi.iptvsync+xml
+application/vnd.etsi.iptvueprofile+xml
+application/vnd.etsi.mcid+xml
+application/vnd.etsi.mheg5
+application/vnd.etsi.overload-control-policy-dataset+xml
+application/vnd.etsi.pstn+xml
+application/vnd.etsi.sci+xml
+application/vnd.etsi.simservs+xml
+application/vnd.etsi.timestamp-token           tst
+application/vnd.etsi.tsl+xml
+application/vnd.etsi.tsl.der
+application/vnd.eu.kasparian.car+json          carjson
  application/vnd.eudora.data
-application/vnd.fdf
+application/vnd.evolv.ecig.profile             ecigprofile
+application/vnd.evolv.ecig.settings            ecig
+application/vnd.evolv.ecig.theme               ecigtheme
+application/vnd.exstream-empower+zip           mpw
+application/vnd.exstream-package               pub
+application/vnd.ezpix-album                    ez2
+application/vnd.ezpix-package                  ez3
+application/vnd.f-secure.mobile
+application/vnd.familysearch.gedcom+zip                gdz
+application/vnd.fastcopy-disk-image            dim
+application/vnd.fdf                            fdf
+application/vnd.fdsn.mseed                     msd mseed
+application/vnd.fdsn.seed                      seed dataless
  application/vnd.ffsns
-application/vnd.flographit
-application/vnd.font-fontforge-sfd                                             sfd
-application/vnd.framemaker
-application/vnd.fsc.weblaunch
-application/vnd.fujitsu.oasys
-application/vnd.fujitsu.oasys2
-application/vnd.fujitsu.oasys3
-application/vnd.fujitsu.oasysgp
-application/vnd.fujitsu.oasysprs
-application/vnd.fujixerox.ddd
-application/vnd.fujixerox.docuworks
-application/vnd.fujixerox.docuworks.binder
+application/vnd.ficlab.flb+zip                 flb
+application/vnd.filmit.zfc                     zfc
+application/vnd.fints
+application/vnd.firemonkeys.cloudcell
+application/vnd.FloGraphIt                     gph
+application/vnd.fluxtime.clip                  ftc
+application/vnd.font-fontforge-sfd             sfd
+application/vnd.framemaker                     fm
+application/vnd.fsc.weblaunch                  fsc
+application/vnd.fujifilm.fb.docuworks
+application/vnd.fujifilm.fb.docuworks.binder
+application/vnd.fujifilm.fb.docuworks.container
+application/vnd.fujifilm.fb.jfi+xml
+application/vnd.fujitsu.oasys                  oas
+application/vnd.fujitsu.oasys2                 oa2
+application/vnd.fujitsu.oasys3                 oa3
+application/vnd.fujitsu.oasysgp                        fg5
+application/vnd.fujitsu.oasysprs               bh2
+application/vnd.fujixerox.ART-EX
+application/vnd.fujixerox.ART4
+application/vnd.fujixerox.ddd                  ddd
+application/vnd.fujixerox.docuworks            xdw
+application/vnd.fujixerox.docuworks.binder     xbd
+application/vnd.fujixerox.docuworks.container  xct
+application/vnd.fujixerox.HBPL
  application/vnd.fut-misnet
-application/vnd.google-earth.kml+xml                                           kml
-application/vnd.google-earth.kmz                                               kmz
-application/vnd.grafeq
-application/vnd.groove-account
-application/vnd.groove-identity-message
-application/vnd.groove-injector
-application/vnd.groove-tool-message
-application/vnd.groove-tool-template
-application/vnd.groove-vcard
-application/vnd.hhe.lesson-player
-application/vnd.hp-HPGL
-application/vnd.hp-PCL
+application/vnd.futoin+cbor
+application/vnd.futoin+json
+application/vnd.fuzzysheet                     fzs
+application/vnd.genomatix.tuxedo               txd
+application/vnd.gentics.grd+json
+application/vnd.geogebra.file                  ggb
+application/vnd.geogebra.slides                        ggs
+application/vnd.geogebra.tool                  ggt
+application/vnd.geometry-explorer              gex gre
+application/vnd.geonext                                gxt
+application/vnd.geoplan                                g2w
+application/vnd.geospace                       g3w
+application/vnd.gerber
+application/vnd.globalplatform.card-content-mgt
+application/vnd.globalplatform.card-content-mgt-response
+application/vnd.gnu.taler.exchange+json
+application/vnd.gnu.taler.merchant+json
+application/vnd.google-earth.kml+xml           kml
+application/vnd.google-earth.kmz               kmz
+application/vnd.gov.sk.e-form+xml
+application/vnd.gov.sk.e-form+zip
+application/vnd.gov.sk.xmldatacontainer+xml
+application/vnd.grafeq                         gqf gqs
+application/vnd.gridmp
+application/vnd.groove-account                 gac
+application/vnd.groove-help                    ghf
+application/vnd.groove-identity-message                gim
+application/vnd.groove-injector                        grv
+application/vnd.groove-tool-message            gtm
+application/vnd.groove-tool-template           tpl
+application/vnd.groove-vcard                   vcg
+application/vnd.hal+json
+application/vnd.hal+xml                                hal
+application/vnd.HandHeld-Entertainment+xml     zmm
+application/vnd.hbci                           hbci hbc kom upa pkd bpd
+application/vnd.hc+json
+application/vnd.hcl-bireports
+application/vnd.hdt                            hdt
+application/vnd.heroku+json
+application/vnd.hhe.lesson-player              les
+application/vnd.hl7cda+xml
+application/vnd.hl7v2+xml
+application/vnd.hp-HPGL                                hpgl
+application/vnd.hp-hpid                                hpi hpid
+application/vnd.hp-hps                         hps
+application/vnd.hp-jlyt                                jlt
+application/vnd.hp-PCL                         pcl
  application/vnd.hp-PCLXL
-application/vnd.hp-hpid
-application/vnd.hp-hps
  application/vnd.httphone
+application/vnd.hydrostatix.sof-data           sfd-hdstx
+application/vnd.hyper+json
+application/vnd.hyper-item+json
+application/vnd.hyperdrive+json
  application/vnd.hzn-3d-crossword
-application/vnd.ibm.MiniPay
-application/vnd.ibm.afplinedata
-application/vnd.ibm.modcap
-application/vnd.informix-visionary
-application/vnd.intercon.formnet
+application/vnd.ibm.electronic-media           emm
+application/vnd.ibm.MiniPay                    mpy
+application/vnd.ibm.rights-management          irm
+application/vnd.ibm.secure-container           sc
+application/vnd.iccprofile                     icc icm
+application/vnd.ieee.1905                      1905.1
+application/vnd.igloader                       igl
+application/vnd.imagemeter.folder+zip          imf
+application/vnd.imagemeter.image+zip           imi
+application/vnd.immervision-ivp                        ivp
+application/vnd.immervision-ivu                        ivu
+application/vnd.ims.imsccv1p1                  imscc
+application/vnd.ims.imsccv1p2
+application/vnd.ims.imsccv1p3
+application/vnd.ims.lis.v2.result+json
+application/vnd.ims.lti.v2.toolconsumerprofile+json
+application/vnd.ims.lti.v2.toolproxy+json
+application/vnd.ims.lti.v2.toolproxy.id+json
+application/vnd.ims.lti.v2.toolsettings+json
+application/vnd.ims.lti.v2.toolsettings.simple+json
+application/vnd.informedcontrol.rms+xml
+application/vnd.infotech.project
+application/vnd.infotech.project+xml
+application/vnd.innopath.wamp.notification
+application/vnd.insors.igm                     igm
+application/vnd.intercon.formnet               xpw xpx
+application/vnd.intergeo                       i2g
  application/vnd.intertrust.digibox
  application/vnd.intertrust.nncp
-application/vnd.intu.qbo
-application/vnd.intu.qfx
-application/vnd.irepository.package+xml
-application/vnd.is-xpr
+application/vnd.intu.qbo                       qbo
+application/vnd.intu.qfx                       qfx
+application/vnd.iptc.g2.catalogitem+xml
+application/vnd.iptc.g2.conceptitem+xml
+application/vnd.iptc.g2.knowledgeitem+xml
+application/vnd.iptc.g2.newsitem+xml
+application/vnd.iptc.g2.newsmessage+xml
+application/vnd.iptc.g2.packageitem+xml
+application/vnd.iptc.g2.planningitem+xml
+application/vnd.ipunplugged.rcprofile          rcprofile
+application/vnd.irepository.package+xml                irp
+application/vnd.is-xpr                         xpr
+application/vnd.isac.fcs                       fcs
+application/vnd.iso11783-10+zip
+application/vnd.jam                            jam
  application/vnd.japannet-directory-service
  application/vnd.japannet-jpnstore-wakeup
  application/vnd.japannet-payment-wakeup
@@ -238,25 +895,74 @@ application/vnd.japannet-registration-wakeup
  application/vnd.japannet-setstore-wakeup
  application/vnd.japannet-verification
  application/vnd.japannet-verification-wakeup
-application/vnd.koan
-application/vnd.lotus-1-2-3
-application/vnd.lotus-approach
-application/vnd.lotus-freelance
-application/vnd.lotus-notes
-application/vnd.lotus-organizer
-application/vnd.lotus-screencam
-application/vnd.lotus-wordpro
-application/vnd.mcd
-application/vnd.mediastation.cdkey
+application/vnd.jcp.javame.midlet-rms          rms
+application/vnd.jisp                           jisp
+application/vnd.joost.joda-archive             joda
+application/vnd.jsk.isdn-ngn
+application/vnd.kahootz                                ktz ktr
+application/vnd.kde.karbon                     karbon
+application/vnd.kde.kchart                     chrt
+application/vnd.kde.kformula                   kfo
+application/vnd.kde.kivio                      flw
+application/vnd.kde.kontour                    kon
+application/vnd.kde.kpresenter                 kpr kpt
+application/vnd.kde.kspread                    ksp
+application/vnd.kde.kword                      kwd kwt
+application/vnd.kenameaapp                     htke
+application/vnd.kidspiration                   kia
+application/vnd.Kinar                          kne knp sdf
+application/vnd.koan                           skp skd skm skt
+application/vnd.kodak-descriptor               sse
+application/vnd.las                            las
+application/vnd.las.las+json                   lasjson
+application/vnd.las.las+xml                    lasxml
+application/vnd.laszip
+application/vnd.leap+json
+application/vnd.liberty-request+xml
+application/vnd.llamagraphics.life-balance.desktop     lbd
+application/vnd.llamagraphics.life-balance.exchange+xml        lbe
+application/vnd.logipipe.circuit+zip           lcs lca
+application/vnd.loom                           loom
+application/vnd.lotus-1-2-3                    123 wk4 wk3 wk1
+application/vnd.lotus-approach                 apr vew
+application/vnd.lotus-freelance                        prz pre
+application/vnd.lotus-notes                    nsf ntf ndl ns4 ns3 ns2 nsh nsg
+application/vnd.lotus-organizer                        or3 or2 org
+application/vnd.lotus-screencam                        scm
+application/vnd.lotus-wordpro                  lwp sam
+application/vnd.macports.portpkg               portpkg
+application/vnd.mapbox-vector-tile             mvt
+application/vnd.marlin.drm.actiontoken+xml
+application/vnd.marlin.drm.conftoken+xml
+application/vnd.marlin.drm.license+xml
+application/vnd.marlin.drm.mdcf                        mdc
+application/vnd.mason+json
+application/vnd.maxar.archive.3tz+zip          3tz
+application/vnd.maxmind.maxmind-db             mmdb
+application/vnd.mcd                            mcd
+application/vnd.medcalcdata                    mc1
+application/vnd.mediastation.cdkey             cdkey
  application/vnd.meridian-slingshot
-application/vnd.mif
+application/vnd.MFER                           mwf
+application/vnd.mfmp                           mfm
+application/vnd.micro+json
+application/vnd.micrografx.flo                 flo
+application/vnd.micrografx.igx                 igx
+application/vnd.microsoft.portable-executable
+application/vnd.microsoft.windows.thumbnail-cache
+application/vnd.miele+json
+application/vnd.mif                            mif
  application/vnd.minisoft-hp3000-save
  application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf
-application/vnd.mobius.dis
-application/vnd.mobius.msl
-application/vnd.mobius.plc
-application/vnd.mobius.txf
+application/vnd.Mobius.DAF                     daf
+application/vnd.Mobius.DIS                     dis
+application/vnd.Mobius.MBK                     mbk
+application/vnd.Mobius.MQY                     mqy
+application/vnd.Mobius.MSL                     msl
+application/vnd.Mobius.PLC                     plc
+application/vnd.Mobius.TXF                     txf
+application/vnd.mophun.application             mpn
+application/vnd.mophun.certificate             mpc
  application/vnd.motorola.flexsuite
  application/vnd.motorola.flexsuite.adsi
  application/vnd.motorola.flexsuite.fis
@@ -264,47 +970,104 @@ application/vnd.motorola.flexsuite.gotap
  application/vnd.motorola.flexsuite.kmr
  application/vnd.motorola.flexsuite.ttc
  application/vnd.motorola.flexsuite.wem
-application/vnd.mozilla.xul+xml                                                        xul
-application/vnd.ms-artgalry
-application/vnd.ms-asf
-application/vnd.ms-excel                                                       xls xlb xlt
-application/vnd.ms-excel.addin.macroEnabled.12                                 xlam
-application/vnd.ms-excel.sheet.binary.macroEnabled.12                          xlsb
-application/vnd.ms-excel.sheet.macroEnabled.12                                 xlsm
-application/vnd.ms-excel.template.macroEnabled.12                              xltm
-application/vnd.ms-fontobject                                                  eot
-application/vnd.ms-lrm
-application/vnd.ms-officetheme                                                 thmx
-application/vnd.ms-pki.seccat                                                  cat
-#application/vnd.ms-pki.stl                                                    stl
+application/vnd.motorola.iprm
+application/vnd.mozilla.xul+xml                        xul
+application/vnd.ms-3mfdocument                 3mf
+application/vnd.ms-artgalry                    cil
+application/vnd.ms-asf                         asf
+application/vnd.ms-cab-compressed              cab
+application/vnd.ms-excel                       xls xlm xla xlc xlt xlw
+application/vnd.ms-excel.addin.macroEnabled.12 xlam
+application/vnd.ms-excel.sheet.binary.macroEnabled.12  xlsb
+application/vnd.ms-excel.sheet.macroEnabled.12 xlsm
+application/vnd.ms-excel.template.macroEnabled.12      xltm
+application/vnd.ms-fontobject                  eot
+application/vnd.ms-htmlhelp                    chm
+application/vnd.ms-ims                         ims
+application/vnd.ms-lrm                         lrm
+application/vnd.ms-office.activeX+xml
+application/vnd.ms-officetheme                 thmx
+application/vnd.ms-pki.seccat                  cat
+application/vnd.ms-playready.initiator+xml
  application/vnd.ms-powerpoint                                                  ppt pps
  application/vnd.ms-powerpoint.addin.macroEnabled.12                            ppam
  application/vnd.ms-powerpoint.presentation.macroEnabled.12                     pptm
  application/vnd.ms-powerpoint.slide.macroEnabled.12                            sldm
  application/vnd.ms-powerpoint.slideshow.macroEnabled.12                                ppsm
  application/vnd.ms-powerpoint.template.macroEnabled.12                         potm
-application/vnd.ms-project
-application/vnd.ms-tnef
+application/vnd.ms-PrintDeviceCapabilities+xml
+application/vnd.ms-PrintSchemaTicket+xml
+application/vnd.ms-project                     mpp mpt
+application/vnd.ms-tnef                                tnef tnf
+application/vnd.ms-windows.devicepairing
+application/vnd.ms-windows.nwprinting.oob
+application/vnd.ms-windows.printerpairing
+application/vnd.ms-windows.wsd.oob
+application/vnd.ms-wmdrm.lic-chlg-req
+application/vnd.ms-wmdrm.lic-resp
+application/vnd.ms-wmdrm.meter-chlg-req
+application/vnd.ms-wmdrm.meter-resp
  application/vnd.ms-word.document.macroEnabled.12                               docm
  application/vnd.ms-word.template.macroEnabled.12                               dotm
-application/vnd.ms-works
-application/vnd.mseq
+application/vnd.ms-works                       wcm wdb wks wps
+application/vnd.ms-wpl                         wpl
+application/vnd.ms-xpsdocument                 xps
+application/vnd.msa-disk-image                 msa
+application/vnd.mseq                           mseq
  application/vnd.msign
+application/vnd.multiad.creator                        crtr
+application/vnd.multiad.creator.cif            cif
  application/vnd.music-niff
-application/vnd.musician
+application/vnd.musician                       mus
+application/vnd.muvee.style                    msty
+application/vnd.mynfc                          taglet
+application/vnd.nacamar.ybrid+json
+application/vnd.ncd.control
+application/vnd.ncd.reference
+application/vnd.nearst.inv+json
+application/vnd.nebumind.line                  nebul line
+application/vnd.nervana                                entity request bkm kcm
  application/vnd.netfpx
-application/vnd.noblenet-directory
-application/vnd.noblenet-sealer
-application/vnd.noblenet-web
-application/vnd.novadigm.EDM
-application/vnd.novadigm.EDX
-application/vnd.novadigm.EXT
+application/vnd.neurolanguage.nlu              nlu
+application/vnd.nimn                           nimn
+application/vnd.nintendo.nitro.rom             nds
+application/vnd.nintendo.snes.rom              sfc smc
+application/vnd.nitf                           nitf
+application/vnd.noblenet-directory             nnd
+application/vnd.noblenet-sealer                        nns
+application/vnd.noblenet-web                   nnw
+application/vnd.nokia.catalogs
+application/vnd.nokia.conml+wbxml
+application/vnd.nokia.conml+xml
+application/vnd.nokia.iptv.config+xml
+application/vnd.nokia.iSDS-radio-presets
+application/vnd.nokia.landmark+wbxml
+application/vnd.nokia.landmark+xml
+application/vnd.nokia.landmarkcollection+xml
+application/vnd.nokia.n-gage.ac+xml
+application/vnd.nokia.n-gage.data              ngdat
+application/vnd.nokia.ncd
+application/vnd.nokia.pcd+wbxml
+application/vnd.nokia.pcd+xml
+application/vnd.nokia.radio-preset             rpst
+application/vnd.nokia.radio-presets            rpss
+application/vnd.novadigm.EDM                   edm
+application/vnd.novadigm.EDX                   edx
+application/vnd.novadigm.EXT                   ext
+application/vnd.ntt-local.content-share
+application/vnd.ntt-local.file-transfer
+application/vnd.ntt-local.ogw_remote-access
+application/vnd.ntt-local.sip-ta_remote
+application/vnd.ntt-local.sip-ta_tcp_stream
  application/vnd.oasis.opendocument.chart                                       odc
+application/vnd.oasis.opendocument.chart-template                              otc
  application/vnd.oasis.opendocument.database                                    odb
  application/vnd.oasis.opendocument.formula                                     odf
+application/vnd.oasis.opendocument.formula-template
  application/vnd.oasis.opendocument.graphics                                    odg
  application/vnd.oasis.opendocument.graphics-template                           otg
  application/vnd.oasis.opendocument.image                                       odi
+application/vnd.oasis.opendocument.image-template                              oti
  application/vnd.oasis.opendocument.presentation                                        odp
  application/vnd.oasis.opendocument.presentation-template                       otp
  application/vnd.oasis.opendocument.spreadsheet                                 ods
@@ -313,37 +1076,265 @@ application/vnd.oasis.opendocument.text                                         odt
  application/vnd.oasis.opendocument.text-master                                 odm
  application/vnd.oasis.opendocument.text-template                               ott
  application/vnd.oasis.opendocument.text-web                                    oth
+application/vnd.obn
+application/vnd.ocf+cbor
+application/vnd.oci.image.manifest.v1+json
+application/vnd.oftn.l10n+json
+application/vnd.oipf.contentaccessdownload+xml
+application/vnd.oipf.contentaccessstreaming+xml
+application/vnd.oipf.cspg-hexbinary
+application/vnd.oipf.dae.svg+xml
+application/vnd.oipf.dae.xhtml+xml
+application/vnd.oipf.mippvcontrolmessage+xml
+application/vnd.oipf.pae.gem
+application/vnd.oipf.spdiscovery+xml
+application/vnd.oipf.spdlist+xml
+application/vnd.oipf.ueprofile+xml
+application/vnd.oipf.userprofile+xml
+application/vnd.olpc-sugar                     xo
+application/vnd.oma-scws-config
+application/vnd.oma-scws-http-request
+application/vnd.oma-scws-http-response
+application/vnd.oma.bcast.associated-procedure-parameter+xml
+application/vnd.oma.bcast.drm-trigger+xml
+application/vnd.oma.bcast.imd+xml
+application/vnd.oma.bcast.ltkm
+application/vnd.oma.bcast.notification+xml
+application/vnd.oma.bcast.provisioningtrigger
+application/vnd.oma.bcast.sgboot
+application/vnd.oma.bcast.sgdd+xml
+application/vnd.oma.bcast.sgdu
+application/vnd.oma.bcast.simple-symbol-container
+application/vnd.oma.bcast.smartcard-trigger+xml
+application/vnd.oma.bcast.sprov+xml
+application/vnd.oma.bcast.stkm
+application/vnd.oma.cab-address-book+xml
+application/vnd.oma.cab-feature-handler+xml
+application/vnd.oma.cab-pcc+xml
+application/vnd.oma.cab-subs-invite+xml
+application/vnd.oma.cab-user-prefs+xml
+application/vnd.oma.dcd
+application/vnd.oma.dcdc
+application/vnd.oma.dd2+xml                    dd2
+application/vnd.oma.drm.risd+xml
+application/vnd.oma.group-usage-list+xml
+application/vnd.oma.lwm2m+cbor
+application/vnd.oma.lwm2m+json
+application/vnd.oma.lwm2m+tlv
+application/vnd.oma.pal+xml
+application/vnd.oma.poc.detailed-progress-report+xml
+application/vnd.oma.poc.final-report+xml
+application/vnd.oma.poc.groups+xml
+application/vnd.oma.poc.invocation-descriptor+xml
+application/vnd.oma.poc.optimized-progress-report+xml
+application/vnd.oma.push
+application/vnd.oma.scidm.messages+xml
+application/vnd.oma.xcap-directory+xml
+application/vnd.omads-email+xml
+application/vnd.omads-file+xml
+application/vnd.omads-folder+xml
+application/vnd.omaloc-supl-init
+application/vnd.onepager                       tam
+application/vnd.onepagertamp                   tamp
+application/vnd.onepagertamx                   tamx
+application/vnd.onepagertat                    tat
+application/vnd.onepagertatp                   tatp
+application/vnd.onepagertatx                   tatx
+application/vnd.openblox.game+xml              obgx
+application/vnd.openblox.game-binary           obg
+application/vnd.openeye.oeb                    oeb
+application/vnd.openofficeorg.extension                oxt
+application/vnd.openstreetmap.data+xml         osm
+application/vnd.opentimestamps.ots
+application/vnd.openxmlformats-officedocument.custom-properties+xml
+application/vnd.openxmlformats-officedocument.customXmlProperties+xml
+application/vnd.openxmlformats-officedocument.drawing+xml
+application/vnd.openxmlformats-officedocument.drawingml.chart+xml
+application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml
+application/vnd.openxmlformats-officedocument.drawingml.diagramColors+xml
+application/vnd.openxmlformats-officedocument.drawingml.diagramData+xml
+application/vnd.openxmlformats-officedocument.drawingml.diagramLayout+xml
+application/vnd.openxmlformats-officedocument.drawingml.diagramStyle+xml
+application/vnd.openxmlformats-officedocument.extended-properties+xml
+application/vnd.openxmlformats-officedocument.presentationml.commentAuthors+xml
+application/vnd.openxmlformats-officedocument.presentationml.comments+xml
+application/vnd.openxmlformats-officedocument.presentationml.handoutMaster+xml
+application/vnd.openxmlformats-officedocument.presentationml.notesMaster+xml
+application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml
  application/vnd.openxmlformats-officedocument.presentationml.presentation      pptx
+application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml
+application/vnd.openxmlformats-officedocument.presentationml.presProps+xml
  application/vnd.openxmlformats-officedocument.presentationml.slide             sldx
+application/vnd.openxmlformats-officedocument.presentationml.slide+xml
+application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml
+application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml
  application/vnd.openxmlformats-officedocument.presentationml.slideshow         ppsx
+application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml
+application/vnd.openxmlformats-officedocument.presentationml.slideUpdateInfo+xml
+application/vnd.openxmlformats-officedocument.presentationml.tableStyles+xml
+application/vnd.openxmlformats-officedocument.presentationml.tags+xml
  application/vnd.openxmlformats-officedocument.presentationml.template          potx
+application/vnd.openxmlformats-officedocument.presentationml.template.main+xml
+application/vnd.openxmlformats-officedocument.presentationml.viewProps+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.dialogsheet+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.queryTable+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.revisionLog+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml
  application/vnd.openxmlformats-officedocument.spreadsheetml.sheet              xlsx
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMetadata+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.tableSingleCells+xml
  application/vnd.openxmlformats-officedocument.spreadsheetml.template           xltx
+application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.volatileDependencies+xml
+application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml
+application/vnd.openxmlformats-officedocument.theme+xml
+application/vnd.openxmlformats-officedocument.themeOverride+xml
+application/vnd.openxmlformats-officedocument.vmlDrawing
+application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml
  application/vnd.openxmlformats-officedocument.wordprocessingml.document                docx
+application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml
+application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml
+application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml
+application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml
+application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml
+application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml
+application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml
+application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml
+application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml
  application/vnd.openxmlformats-officedocument.wordprocessingml.template                dotx
-application/vnd.osa.netdeploy
-application/vnd.palm
-application/vnd.pg.format
-application/vnd.pg.osasli
-application/vnd.powerbuilder6
+application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml
+application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml
+application/vnd.openxmlformats-package.core-properties+xml
+application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml
+application/vnd.openxmlformats-package.relationships+xml
+application/vnd.oracle.resource+json
+application/vnd.orange.indata
+application/vnd.osa.netdeploy                  ndc
+application/vnd.osgeo.mapguide.package         mgp
+application/vnd.osgi.bundle
+application/vnd.osgi.dp                                dp
+application/vnd.osgi.subsystem                 esa
+application/vnd.otps.ct-kip+xml
+application/vnd.oxli.countgraph                        oxlicg
+application/vnd.pagerduty+json
+application/vnd.palm                           pdb pqa oprc
+application/vnd.panoply                                plp
+application/vnd.paos.xml
+application/vnd.patentdive                     dive
+application/vnd.patientecommsdoc
+application/vnd.pawaafile                      paw
+application/vnd.pcos
+application/vnd.pg.format                      str
+application/vnd.pg.osasli                      ei6
+application/vnd.piaccess.application-licence   pil
+application/vnd.picsel                         efif
+application/vnd.pmi.widget                     wg
+application/vnd.poc.group-advertisement+xml
+application/vnd.pocketlearn                    plf
+application/vnd.powerbuilder6                  pbd
  application/vnd.powerbuilder6-s
  application/vnd.powerbuilder7
  application/vnd.powerbuilder7-s
  application/vnd.powerbuilder75
  application/vnd.powerbuilder75-s
-application/vnd.previewsystems.box
-application/vnd.publishare-delta-tree
-application/vnd.pvi.ptid1
+application/vnd.preminet                       preminet
+application/vnd.previewsystems.box             box vbox
+application/vnd.proteus.magazine               mgz
+application/vnd.psfs                           psfs
+application/vnd.publishare-delta-tree          qps
+application/vnd.pvi.ptid1                      ptid
+application/vnd.pwg-multiplexed
  application/vnd.pwg-xhtml-print+xml
+application/vnd.qualcomm.brew-app-res          bar
+application/vnd.quarantainenet
+application/vnd.Quark.QuarkXPress              qxd qxt qwd qwt qxl qxb
+application/vnd.quobject-quoxdocument          quox quiz
+application/vnd.radisys.moml+xml
+application/vnd.radisys.msml+xml
+application/vnd.radisys.msml-audit+xml
+application/vnd.radisys.msml-audit-conf+xml
+application/vnd.radisys.msml-audit-conn+xml
+application/vnd.radisys.msml-audit-dialog+xml
+application/vnd.radisys.msml-audit-stream+xml
+application/vnd.radisys.msml-conf+xml
+application/vnd.radisys.msml-dialog+xml
+application/vnd.radisys.msml-dialog-base+xml
+application/vnd.radisys.msml-dialog-fax-detect+xml
+application/vnd.radisys.msml-dialog-fax-sendrecv+xml
+application/vnd.radisys.msml-dialog-group+xml
+application/vnd.radisys.msml-dialog-speech+xml
+application/vnd.radisys.msml-dialog-transform+xml
+application/vnd.rainstor.data                  tree
  application/vnd.rapid
+application/vnd.rar                            rar
+application/vnd.realvnc.bed                    bed
+application/vnd.recordare.musicxml             mxl
+application/vnd.recordare.musicxml+xml
+application/vnd.RenLearn.rlprint
+application/vnd.resilient.logic                        rlm reload
+application/vnd.restful+json
+application/vnd.rig.cryptonote                 cryptonote
  application/vnd.rim.cod                                                                cod
+application/vnd.route66.link66+xml             link66
+application/vnd.rs-274x
+application/vnd.ruckus.download
  application/vnd.s3sms
-application/vnd.seemail
-application/vnd.shana.informed.formdata
-application/vnd.shana.informed.formtemplate
-application/vnd.shana.informed.interchange
-application/vnd.shana.informed.package
-application/vnd.smaf                                                           mmf
+application/vnd.sailingtracker.track           st
+application/vnd.sar                            SAR
+application/vnd.sbm.cid
+application/vnd.sbm.mid2
+application/vnd.scribus                                scd sla slaz
+application/vnd.sealed.3df                     s3df
+application/vnd.sealed.csf                     scsf
+application/vnd.sealed.doc                     sdoc sdo s1w
+application/vnd.sealed.eml                     seml sem
+application/vnd.sealed.mht                     smht smh
+application/vnd.sealed.net
+application/vnd.sealed.ppt                     sppt s1p
+application/vnd.sealed.tiff                    stif
+application/vnd.sealed.xls                     sxls sxl s1e
+application/vnd.sealedmedia.softseal.html      stml s1h
+application/vnd.sealedmedia.softseal.pdf       spdf spd s1a
+application/vnd.seemail                                see
+application/vnd.seis+json
+application/vnd.sema                           sema
+application/vnd.semd                           semd
+application/vnd.semf                           semf
+application/vnd.shade-save-file                        ssv
+application/vnd.shana.informed.formdata                ifm
+application/vnd.shana.informed.formtemplate    itp
+application/vnd.shana.informed.interchange     iif
+application/vnd.shana.informed.package         ipk
+application/vnd.shootproof+json
+application/vnd.shopkick+json
+application/vnd.shp                            shp
+application/vnd.shx                            shx
+application/vnd.sigrok.session                 sr
+application/vnd.SimTech-MindMapper             twd twds
+application/vnd.siren+json
+application/vnd.smaf                           mmf
+application/vnd.smart.notebook                 notebook
+application/vnd.smart.teacher                  teacher
+application/vnd.snesdev-page-table             ptrom pt
+application/vnd.software602.filler.form+xml    fo
+application/vnd.software602.filler.form-xml-zip        zfo
+application/vnd.solent.sdkm+xml                        sdkm sdkd
+application/vnd.spotfire.dxp                   dxp
+application/vnd.spotfire.sfs                   sfs
+application/vnd.sqlite3                                sqlite sqlite3
  application/vnd.sss-cod
  application/vnd.sss-dtf
  application/vnd.sss-ntf
@@ -351,10 +1342,13 @@ application/vnd.stardivision.calc                                                sdc
  application/vnd.stardivision.chart                                             sds
  application/vnd.stardivision.draw                                              sda
  application/vnd.stardivision.impress                                           sdd
-application/vnd.stardivision.math                                              sdf
+application/vnd.stardivision.math                                              smf
  application/vnd.stardivision.writer                                            sdw
  application/vnd.stardivision.writer-global                                     sgl
+application/vnd.stepmania.package              smzip
+application/vnd.stepmania.stepchart            sm
  application/vnd.street-stream
+application/vnd.sun.wadl+xml                   wadl
  application/vnd.sun.xml.calc                                                   sxc
  application/vnd.sun.xml.calc.template                                          stc
  application/vnd.sun.xml.draw                                                   sxd
@@ -365,15 +1359,40 @@ application/vnd.sun.xml.math                                                     sxm
  application/vnd.sun.xml.writer                                                 sxw
  application/vnd.sun.xml.writer.global                                          sxg
  application/vnd.sun.xml.writer.template                                                stw
+application/vnd.sus-calendar                   sus susp
  application/vnd.svd
  application/vnd.swiftview-ics
+application/vnd.sycle+xml                      scl
+application/vnd.syft+json                      syft.json
  application/vnd.symbian.install                                                        sis
-application/vnd.tcpdump.pcap                                                   cap pcap
-application/vnd.triscape.mxs
-application/vnd.trueapp
+application/vnd.syncml+xml                     xsm
+application/vnd.syncml.dm+wbxml                        bdm
+application/vnd.syncml.dm+xml                  xdm
+application/vnd.syncml.dm.notification
+application/vnd.syncml.dmddf+wbxml
+application/vnd.syncml.dmddf+xml               ddf
+application/vnd.syncml.dmtnds+wbxml
+application/vnd.syncml.dmtnds+xml
+application/vnd.syncml.ds.notification
+application/vnd.tableschema+json
+application/vnd.tao.intent-module-archive      tao
+application/vnd.tcpdump.pcap                   pcap cap dmp
+application/vnd.theqvd                         qvd
+application/vnd.think-cell.ppttc+json          ppttc
+application/vnd.tmd.mediaflex.api+xml
+application/vnd.tml                            vfr viaframe
+application/vnd.tmobile-livetv                 tmo
+application/vnd.tri.onesource
+application/vnd.trid.tpt                       tpt
+application/vnd.triscape.mxs                   mxs
+application/vnd.trueapp                                tra
  application/vnd.truedoc
-application/vnd.tve-trigger
-application/vnd.ufdl
+application/vnd.ubisoft.webplayer
+application/vnd.ufdl                           ufdl ufd frm
+application/vnd.uiq.theme                      utz
+application/vnd.umajin                         umj
+application/vnd.unity                          unityweb
+application/vnd.uoml+xml                       uoml uo
  application/vnd.uplanet.alert
  application/vnd.uplanet.alert-wbxml
  application/vnd.uplanet.bearer-choice
@@ -387,51 +1406,98 @@ application/vnd.uplanet.list-wbxml
  application/vnd.uplanet.listcmd
  application/vnd.uplanet.listcmd-wbxml
  application/vnd.uplanet.signal
-application/vnd.vcx
-application/vnd.vectorworks
-application/vnd.vidsoft.vidconference
-application/vnd.visio                                                          vsd vst vsw vss
+application/vnd.uri-map                                urim urimap
+application/vnd.valve.source.material          vmt
+application/vnd.vcx                            vcx
+application/vnd.vd-study                       mxi study-inter model-inter
+application/vnd.vectorworks                    vwx
+application/vnd.vel+json
+application/vnd.verimatrix.vcas
+application/vnd.veritone.aion+json             aion vtnstd
+application/vnd.veryant.thin                   istc isws
+application/vnd.ves.encrypted                  VES
+application/vnd.vidsoft.vidconference          vsc
+application/vnd.visio                          vsd vst vsw vss
+application/vnd.visionary                      vis
  application/vnd.vividence.scriptfile
-application/vnd.wap.sic
-application/vnd.wap.slc
-application/vnd.wap.wbxml                                                      wbxml
-application/vnd.wap.wmlc                                                       wmlc
-application/vnd.wap.wmlscriptc                                                 wmlsc
-application/vnd.webturbo
-application/vnd.wordperfect                                                    wpd
+application/vnd.vsf                            vsf
+application/vnd.wap.sic                                sic
+application/vnd.wap.slc                                slc
+application/vnd.wap.wbxml                      wbxml
+application/vnd.wap.wmlc                       wmlc
+application/vnd.wap.wmlscriptc                 wmlsc
+application/vnd.webturbo                       wtb
+application/vnd.wfa.dpp
+application/vnd.wfa.p2p                                p2p
+application/vnd.wfa.wsc                                wsc
+application/vnd.windows.devicepairing
+application/vnd.wmc                            wmc
+application/vnd.wmf.bootstrap
+application/vnd.wolfram.mathematica            nb
+application/vnd.wolfram.mathematica.package    m
+application/vnd.wolfram.player                 nbp
+application/vnd.wordperfect                    wpd
  application/vnd.wordperfect5.1                                                 wp5
+application/vnd.wqd                            wqd
  application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf
-application/vnd.xara
-application/vnd.xfdl
-application/vnd.yellowriver-custom-menu
-application/zlib
+application/vnd.wt.stf                         stf
+application/vnd.wv.csp+wbxml                   wv
+application/vnd.wv.csp+xml
+application/vnd.wv.ssp+xml
+application/vnd.xacml+json
+application/vnd.xara                           xar
+application/vnd.xfdl                           xfdl xfd
+application/vnd.xfdl.webform
+application/vnd.xmi+xml
+application/vnd.xmpie.cpkg                     cpkg
+application/vnd.xmpie.dpkg                     dpkg
+application/vnd.xmpie.plan
+application/vnd.xmpie.ppkg                     ppkg
+application/vnd.xmpie.xlim                     xlim
+application/vnd.yamaha.hv-dic                  hvd
+application/vnd.yamaha.hv-script               hvs
+application/vnd.yamaha.hv-voice                        hvp
+application/vnd.yamaha.openscoreformat         osf
+application/vnd.yamaha.openscoreformat.osfpvg+xml
+application/vnd.yamaha.remote-setup
+application/vnd.yamaha.smaf-audio              saf
+application/vnd.yamaha.smaf-phrase             spf
+application/vnd.yamaha.through-ngn
+application/vnd.yamaha.tunnel-udpencap
+application/vnd.yaoweme                                yme
+application/vnd.yellowriver-custom-menu                cmp
+application/vnd.zul                            zir zirz
+application/vnd.zzazz.deck+xml                 zaz
+application/voicexml+xml                       vxml
+application/voucher-cms+json                   vcj
+application/vq-rtcpxr
+application/wasm                               wasm
+application/watcherinfo+xml                    wif
+application/webpush-options+json
+application/whoispp-query
+application/whoispp-response
+application/widget                             wgt
+application/wita
+application/wordperfect5.1
+application/wsdl+xml                           wsdl
+application/wspolicy+xml                       wspolicy
  application/x-123                              wk
  application/x-7z-compressed                    7z
  application/x-abiword                          abw
  application/x-apple-diskimage                  dmg
  application/x-bcpio                            bcpio
  application/x-bittorrent                       torrent
-application/x-cab                              cab
-application/x-cbr                              cbr
-application/x-cbz                              cbz
  application/x-cdf                              cdf cda
  application/x-cdlink                           vcd
-application/x-chess-pgn                                pgn
  application/x-comsol                           mph
-application/x-core
  application/x-cpio                             cpio
  application/x-csh                              csh
-application/x-debian-package                   deb udeb
  application/x-director                         dcr dir dxr
-application/x-dms                              dms
  application/x-doom                             wad
  application/x-dvi                              dvi
-application/x-executable
  application/x-font                             pfa pfb gsf
  application/x-font-pcf                         pcf pcf.Z
  application/x-freemind                         mm
-application/x-futuresplash                     spl
  application/x-ganttproject                     gan
  application/x-gnumeric                         gnumeric
  application/x-go-sgf                           sgf
@@ -439,41 +1505,21 @@ application/x-graphing-calculator                gcf
  application/x-gtar                             gtar
  application/x-gtar-compressed                  tgz taz
  application/x-hdf                              hdf
-#application/x-httpd-eruby                     rhtml
-#application/x-httpd-php                       phtml pht php
-#application/x-httpd-php-source                        phps
-#application/x-httpd-php3                      php3
-#application/x-httpd-php3-preprocessed         php3p
-#application/x-httpd-php4                      php4
-#application/x-httpd-php5                      php5
  application/x-hwp                              hwp
  application/x-ica                              ica
  application/x-info                             info
  application/x-internet-signup                  ins isp
  application/x-iphone                           iii
  application/x-iso9660-image                    iso
-application/x-jam                              jam
-application/x-java-applet
-application/x-java-bean
  application/x-java-jnlp-file                   jnlp
  application/x-jmol                             jmz
-application/x-kchart                           chrt
-application/x-kdelnk
  application/x-killustrator                     kil
-application/x-koan                             skp skd skt skm
-application/x-kpresenter                       kpr kpt
-application/x-kspread                          ksp
-application/x-kword                            kwd kwt
  application/x-latex                            latex
  application/x-lha                              lha
  application/x-lyx                              lyx
  application/x-lzh                              lzh
  application/x-lzx                              lzx
  application/x-maker                            frm maker frame fm fb book fbdoc
-application/x-mif                              mif
-application/x-mpegURL                          m3u8
-application/x-ms-application                   application
-application/x-ms-manifest                      manifest
  application/x-ms-wmd                           wmd
  application/x-ms-wmz                           wmz
  application/x-msdos-program                    com exe bat dll
@@ -484,7 +1530,6 @@ application/x-nwc                          nwc
  application/x-object                           o
  application/x-oz-application                   oza
  application/x-pkcs7-certreqresp                        p7r
-application/x-pkcs7-crl                                crl
  application/x-python-code                      pyc pyo
  application/x-qgis                             qgs shp shx
  application/x-quicktimeplayer                  qtl
@@ -492,15 +1537,11 @@ application/x-rdp                                rdp
  application/x-redhat-package-manager           rpm
  application/x-rss+xml                          rss
  application/x-ruby                             rb
-application/x-rx
  application/x-scilab                           sci sce
  application/x-scilab-xcos                      xcos
  application/x-sh                               sh
  application/x-shar                             shar
-application/x-shellscript
-application/x-shockwave-flash                  swf swfl
  application/x-silverlight                      scr
-application/x-sql                              sql
  application/x-stuffit                          sit sitx
  application/x-sv4cpio                          sv4cpio
  application/x-sv4crc                           sv4crc
@@ -510,62 +1551,214 @@ application/x-tex-gf                            gf
  application/x-tex-pk                           pk
  application/x-texinfo                          texinfo texi
  application/x-trash                            ~ % bak old sik
-application/x-troff                            t tr roff
  application/x-troff-man                                man
  application/x-troff-me                         me
  application/x-troff-ms                         ms
  application/x-ustar                            ustar
-application/x-videolan
  application/x-wais-source                      src
  application/x-wingz                            wz
  application/x-x509-ca-cert                     crt
-application/x-xcf                              xcf
  application/x-xfig                             fig
  application/x-xpinstall                                xpi
  application/x-xz                               xz
+application/x400-bp
+application/xacml+xml
+application/xcap-att+xml                       xav
+application/xcap-caps+xml                      xca
+application/xcap-diff+xml                      xdf
+application/xcap-el+xml                                xel
+application/xcap-error+xml                     xer
+application/xcap-ns+xml                                xns
+application/xcon-conference-info+xml
+application/xcon-conference-info-diff+xml
+application/xenc+xml
+application/xhtml+xml                          xhtml xhtm xht
+application/xliff+xml                          xlf
+application/xml                                        xml
+application/xml-dtd                            dtd mod
+application/xml-external-parsed-entity         ent
+application/xml-patch+xml
+application/xmpp+xml
+application/xop+xml                            xop
+application/xslt+xml                           xsl xslt
+application/xspf+xml                           xspf
+application/xv+xml                             mxml xhvml xvml xvm
+application/yang                               yang
+application/yang-data+json
+application/yang-data+xml
+application/yang-patch+json
+application/yang-patch+xml
+application/yin+xml                            yin
+application/zip                                        zip
+application/zlib
+application/zstd                               zst
  
-audio/32kadpcm
+audio/1d-interleaved-parityfec
+audio/32kadpcm                                 726
  audio/3gpp
-audio/amr                                      amr
-audio/amr-wb                                   awb
+audio/3gpp2
+audio/aac                                      adts aac ass
+audio/ac3                                      ac3
+audio/AMR                                      amr AMR
+audio/AMR-WB                                   awb AWB
+audio/amr-wb+
  audio/annodex                                  axa
+audio/aptx
+audio/asc                                      acn
+audio/ATRAC-ADVANCED-LOSSLESS                  aal
+audio/ATRAC-X                                  atx
+audio/ATRAC3                                   at3 aa3 omg
  audio/basic                                    au snd
+audio/BV16
+audio/BV32
+audio/clearmode
+audio/CN
  audio/csound                                   csd orc sco
+audio/DAT12
+audio/dls                                      dls
+audio/dsr-es201108
+audio/dsr-es202050
+audio/dsr-es202211
+audio/dsr-es202212
+audio/DV
+audio/DVI4
+audio/eac3
+audio/encaprtp
+audio/EVRC                                     evc
+audio/EVRC-QCP                                 qcp QCP
+audio/EVRC0
+audio/EVRC1
+audio/EVRCB                                    evb
+audio/EVRCB0
+audio/EVRCB1
+audio/EVRCNW                                   enw
+audio/EVRCNW0
+audio/EVRCNW1
+audio/EVRCWB                                   evw
+audio/EVRCWB0
+audio/EVRCWB1
+audio/EVS
+audio/example
  audio/flac                                     flac
-audio/g.722.1
-audio/l16
-audio/midi                                     mid midi kar
-audio/mp4a-latm
+audio/flexfec
+audio/fwdred
+audio/G711-0
+audio/G719
+audio/G722
+audio/G7221
+audio/G723
+audio/G726-16
+audio/G726-24
+audio/G726-32
+audio/G726-40
+audio/G728
+audio/G729
+audio/G7291
+audio/G729D
+audio/G729E
+audio/GSM
+audio/GSM-EFR
+audio/GSM-HR-08
+audio/iLBC                                     lbc
+audio/ip-mr_v2.5
+audio/L16                                      l16
+audio/L20
+audio/L24
+audio/L8
+audio/LPC
+audio/MELP
+audio/MELP1200
+audio/MELP2400
+audio/MELP600
+audio/mhas                                     mhas
+audio/mobile-xmf                               mxmf
+audio/mp4                                      m4a
+audio/MP4A-LATM
+audio/MPA
  audio/mpa-robust
-audio/mpeg                                     mpga mpega mp2 mp3 m4a
+audio/mpeg                                     mpga mpega mp1 mp2 mp3
+audio/mpeg4-generic
  audio/mpegurl                                  m3u
  audio/ogg                                      oga ogg opus spx
+audio/opus
  audio/parityfec
-audio/prs.sid                                  sid
+audio/PCMA
+audio/PCMA-WB
+audio/PCMU
+audio/PCMU-WB
+audio/prs.sid                                  sid psid
+audio/QCELP
+audio/raptorfec
+audio/RED
+audio/rtp-enc-aescm128
+audio/rtp-midi
+audio/rtploopback
+audio/rtx
+audio/scip
+audio/SMV                                      smv
+audio/SMV-QCP
+audio/SMV0
+audio/sofa                                     sofa
+audio/sp-midi                                  mid
+audio/speex
+audio/t140c
+audio/t38
  audio/telephone-event
+audio/TETRA_ACELP
+audio/TETRA_ACELP_BB
  audio/tone
+audio/TSVCIS
+audio/UEMCLIP
+audio/ulpfec
+audio/usac                                     loas xhe
+audio/VDVI
+audio/VMR-WB
+audio/vnd.3gpp.iufp
+audio/vnd.4SB
+audio/vnd.audiokoz                             koz
+audio/vnd.CELP
  audio/vnd.cisco.nse
+audio/vnd.cmles.radio-events
  audio/vnd.cns.anp1
  audio/vnd.cns.inf1
-audio/vnd.digital-winds
-audio/vnd.everad.plj
-audio/vnd.lucent.voice
-audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800
-audio/vnd.nuera.ecelp7470
-audio/vnd.nuera.ecelp9600
+audio/vnd.dece.audio                           uva uvva
+audio/vnd.digital-winds                                eol
+audio/vnd.dlna.adts
+audio/vnd.dolby.heaac.1
+audio/vnd.dolby.heaac.2
+audio/vnd.dolby.mlp                            mlp
+audio/vnd.dolby.mps
+audio/vnd.dolby.pl2
+audio/vnd.dolby.pl2x
+audio/vnd.dolby.pl2z
+audio/vnd.dolby.pulse.1
+audio/vnd.dra
+audio/vnd.dts                                  dts
+audio/vnd.dts.hd                               dtshd
+audio/vnd.dts.uhd
+audio/vnd.dvb.file
+audio/vnd.everad.plj                           plj
+audio/vnd.hns.audio
+audio/vnd.lucent.voice                         lvp
+audio/vnd.ms-playready.media.pya               pya
+audio/vnd.nokia.mobile-xmf
+audio/vnd.nortel.vbk                           vbk
+audio/vnd.nuera.ecelp4800                      ecelp4800
+audio/vnd.nuera.ecelp7470                      ecelp7470
+audio/vnd.nuera.ecelp9600                      ecelp9600
  audio/vnd.octel.sbc
-audio/vnd.qcelp
+audio/vnd.presonus.multitrack                  multitrack
  audio/vnd.rhetorex.32kadpcm
+audio/vnd.rip                                  rip
+audio/vnd.sealedmedia.softseal.mpeg            smp3 smp s1m
  audio/vnd.vmx.cvsd
+audio/vorbis
+audio/vorbis-config
  audio/x-aiff                                   aif aiff aifc
  audio/x-gsm                                    gsm
-audio/x-mpegurl                                        m3u
-audio/x-ms-wma                                 wma
  audio/x-ms-wax                                 wax
-audio/x-pn-realaudio-plugin
+audio/x-ms-wma                                 wma
  audio/x-pn-realaudio                           ra rm ram
-audio/x-realaudio                              ra
  audio/x-scpls                                  pls
  audio/x-sd2                                    sd2
  audio/x-wav                                    wav
@@ -575,7 +1768,7 @@ chemical/x-cache                           cac cache
  chemical/x-cache-csf                           csf
  chemical/x-cactvs-binary                       cbin cascii ctab
  chemical/x-cdx                                 cdx
-chemical/x-cerius                              cer
+chemical/x-cerius
  chemical/x-chem3d                              c3d
  chemical/x-chemdraw                            chm
  chemical/x-cif                                 cif
@@ -601,7 +1794,7 @@ chemical/x-isostar                         istr ist
  chemical/x-jcamp-dx                            jdx dx
  chemical/x-kinemage                            kin
  chemical/x-macmolecule                         mcm
-chemical/x-macromodel-input                    mmd mmod
+chemical/x-macromodel-input                    mmod
  chemical/x-mdl-molfile                         mol
  chemical/x-mdl-rdfile                          rd
  chemical/x-mdl-rxnfile                         rxn
@@ -616,10 +1809,10 @@ chemical/x-mopac-input                           mop mopcrt mpc zmt
  chemical/x-mopac-out                           moo
  chemical/x-mopac-vib                           mvb
  chemical/x-ncbi-asn1                           asn
-chemical/x-ncbi-asn1-ascii                     prt ent
+chemical/x-ncbi-asn1-ascii                     prt
  chemical/x-ncbi-asn1-binary                    val aso
  chemical/x-ncbi-asn1-spec                      asn
-chemical/x-pdb                                 pdb ent
+chemical/x-pdb                                 pdb
  chemical/x-rosdal                              ros
  chemical/x-swissprot                           sw
  chemical/x-vamas-iso14976                      vms
@@ -628,42 +1821,88 @@ chemical/x-xtel                                  xtel
  chemical/x-xyz                                 xyz
  
  font/collection                                        ttc
-font/otf                                       ttf otf
-font/sfnt                                      ttf otf
-font/ttf                                       ttf otf
+font/otf                                       otf
+font/sfnt
+font/ttf                                       ttf
  font/woff                                      woff
  font/woff2                                     woff2
  
-image/cgm
+image/aces                                     exr
+image/avci                                     avci
+image/avcs                                     avcs
+image/avif                                     avif hif
+image/bmp                                      bmp
+image/cgm                                      cgm
+image/dicom-rle                                        drle
+image/emf                                      emf
+image/example
+image/fits                                     fits fit fts
  image/g3fax
  image/gif                                      gif
+image/heic                                     heic
+image/heic-sequence                            heics
+image/heif                                     heif
+image/heif-sequence                            heifs
+image/hej2k                                    hej2
+image/hsj2                                     hsj2
  image/ief                                      ief
+image/jls                                      jls
  image/jp2                                      jp2 jpg2
-image/jpeg                                     jpeg jpg jpe
-image/jpm                                      jpm
+image/jpeg                                     jpeg jpg jpe jfif
+image/jph                                      jph
+image/jphc                                     jhc jphc
+image/jpm                                      jpm jpgm
  image/jpx                                      jpx jpf
+image/jxl                                      jxl
+image/jxr                                      jxr
+image/jxrA                                     jxra
+image/jxrS                                     jxrs
+image/jxs                                      jxs
+image/jxsc                                     jxsc
+image/jxsi                                     jxsi
+image/jxss                                     jxss
+image/ktx                                      ktx
+image/ktx2                                     ktx2
  image/naplps
-image/pcx                                      pcx
  image/png                                      png
-image/prs.btif
-image/prs.pti
+image/prs.btif                                 btif btf
+image/prs.pti                                  pti
+image/pwg-raster
  image/svg+xml                                  svg svgz
+image/t38
  image/tiff                                     tiff tif
+image/tiff-fx                                  tfx
+image/vnd.adobe.photoshop                      psd
+image/vnd.airzip.accelerator.azv               azv
  image/vnd.cns.inf2
+image/vnd.dece.graphic                         uvi uvvi uvg uvvg
  image/vnd.djvu                                 djvu djv
-image/vnd.dwg
-image/vnd.dxf
-image/vnd.fastbidsheet
-image/vnd.fpx
-image/vnd.fst
-image/vnd.fujixerox.edmics-mmr
-image/vnd.fujixerox.edmics-rlc
+image/vnd.dvb.subtitle
+image/vnd.dwg                                  dwg
+image/vnd.dxf                                  dxf
+image/vnd.fastbidsheet                         fbs
+image/vnd.fpx                                  fpx
+image/vnd.fst                                  fst
+image/vnd.fujixerox.edmics-mmr                 mmr
+image/vnd.fujixerox.edmics-rlc                 rlc
+image/vnd.globalgraphics.pgb                   PGB pgb
  image/vnd.microsoft.icon                       ico
  image/vnd.mix
+image/vnd.mozilla.apng                         apng
+image/vnd.ms-modi                              mdi
  image/vnd.net-fpx
+image/vnd.pco.b16                              b16
+image/vnd.radiance                             hdr rgbe xyze
+image/vnd.sealed.png                           spng spn s1n
+image/vnd.sealedmedia.softseal.gif             sgif sgi s1g
+image/vnd.sealedmedia.softseal.jpg             sjpg sjp s1j
  image/vnd.svf
+image/vnd.tencent.tap                          tap
+image/vnd.valve.source.texture                 vtf
  image/vnd.wap.wbmp                             wbmp
-image/vnd.xiff
+image/vnd.xiff                                 xif
+image/vnd.zbrush.pcx                           pcx
+image/wmf                                      wmf
  image/x-canon-cr2                              cr2
  image/x-canon-crw                              crw
  image/x-cmu-raster                             ras
@@ -672,175 +1911,319 @@ image/x-coreldrawpattern                       pat
  image/x-coreldrawtemplate                      cdt
  image/x-corelphotopaint                                cpt
  image/x-epson-erf                              erf
-image/x-icon
  image/x-jg                                     art
  image/x-jng                                    jng
-image/x-ms-bmp                                 bmp
  image/x-nikon-nef                              nef
  image/x-olympus-orf                            orf
-image/x-photoshop                              psd
  image/x-portable-anymap                                pnm
  image/x-portable-bitmap                                pbm
  image/x-portable-graymap                       pgm
  image/x-portable-pixmap                                ppm
  image/x-rgb                                    rgb
  image/x-xbitmap                                        xbm
+image/x-xcf                                    xcf
  image/x-xpixmap                                        xpm
  image/x-xwindowdump                            xwd
  
-inode/chardevice
  inode/blockdevice
-inode/directory-locked
+inode/chardevice
  inode/directory
+inode/directory-locked
  inode/fifo
  inode/socket
  
+message/CPIM
  message/delivery-status
  message/disposition-notification
+message/example
  message/external-body
+message/feedback-report
+message/global                                 u8msg
+message/global-delivery-status                 u8dsn
+message/global-disposition-notification                u8mdn
+message/global-headers                         u8hdr
  message/http
-message/s-http
-message/news
+message/imdn+xml
  message/partial
-message/rfc822                                 eml
+message/rfc822                                 eml mail art
+message/s-http
+message/sip
+message/sipfrag
+message/tracking-status
+message/vnd.wfa.wsc
  
+model/3mf
+model/e57
+model/example
+model/gltf+json                                        gltf
+model/gltf-binary                              glb
  model/iges                                     igs iges
  model/mesh                                     msh mesh silo
-model/vnd.dwf
+model/mtl                                      mtl
+model/obj                                      obj
+model/prc                                      prc
+model/step                                     stp step
+model/step+xml                                 stpx
+model/step+zip                                 stpz
+model/step-xml+zip                             stpxz
+model/stl                                      stl
+model/u3d                                      u3d
+model/vnd.collada+xml                          dae
+model/vnd.dwf                                  dwf
  model/vnd.flatland.3dml
-model/vnd.gdl
+model/vnd.gdl                                  gdl gsm win dor lmp rsm msm ism
  model/vnd.gs-gdl
-model/vnd.gtw
-model/vnd.mts
-model/vnd.vtu
-model/vrml                                     wrl vrml
-model/x3d+vrml                                 x3dv
-model/x3d+xml                                  x3d
-model/x3d+binary                               x3db
+model/vnd.gtw                                  gtw
+model/vnd.moml+xml                             moml
+model/vnd.mts                                  mts
+model/vnd.opengex                              ogex
+model/vnd.parasolid.transmit.binary            x_b xmt_bin
+model/vnd.parasolid.transmit.text              x_t xmt_txt
+model/vnd.pytha.pyox                           pyox
+model/vnd.rosette.annotated-data-model
+model/vnd.sap.vds                              vds
+model/vnd.usdz+zip                             usdz
+model/vnd.valve.source.compiled-map            bsp
+model/vnd.vtu                                  vtu
+model/vrml                                     wrl vrm vrml
+model/x3d+fastinfoset                          x3db
+model/x3d+xml                                  x3d x3dz
+model/x3d-vrml                                 x3dv x3dvz
  
  multipart/alternative
  multipart/appledouble
  multipart/byteranges
  multipart/digest
  multipart/encrypted
+multipart/example
  multipart/form-data
  multipart/header-set
  multipart/mixed
+multipart/multilingual
  multipart/parallel
  multipart/related
  multipart/report
  multipart/signed
-multipart/voice-message
+multipart/vnd.bint.med-plus                    bmed
+multipart/voice-message                                vpm
+multipart/x-mixed-replace
  
-text/cache-manifest                            appcache
-text/calendar                                  ics icz
+text/1d-interleaved-parityfec
+text/cache-manifest                            appcache manifest
+text/calendar                                  ics ifb
+text/cql                                       CQL
+text/cql-extension
+text/cql-identifier
  text/css                                       css
  text/csv                                       csv
-text/directory
-text/english
+text/csv-schema                                        csvs
+text/dns                                       soa zone
+text/encaprtp
  text/enriched
-text/h323                                      323
+text/example
+text/fhirpath
+text/flexfec
+text/fwdred
+text/gff3                                      gff3
+text/grammar-ref-list
  text/html                                      html htm shtml
-text/iuls                                      uls
-text/mathml                                    mml
-text/markdown                                   md markdown
+text/javascript                                        es js mjs
+text/jcr-cnd                                   cnd
+text/markdown                                  md markdown
+text/mizar                                     miz
+text/n3                                                n3
+text/parameters
  text/parityfec
-text/plain                                     asc txt text pot brf srt
-text/prs.lines.tag
+text/plain                                     txt text pot brf srt
+text/provenance-notation                       provn
+text/prs.fallenstein.rst                       rst
+text/prs.lines.tag                             tag dsc
+text/prs.prop.logic
+text/raptorfec
+text/RED
  text/rfc822-headers
-text/richtext                                  rtx
  text/rtf
-text/scriptlet                                 sct wsc
+text/rtp-enc-aescm128
+text/rtploopback
+text/rtx
+text/SGML                                      sgml sgm
+text/shaclc                                    shaclc shc
+text/shex                                      shex
+text/spdx                                      spdx
+text/strings
  text/t140
-text/texmacs                                   tm
  text/tab-separated-values                      tsv
+text/texmacs                                   tm
+text/troff                                     t tr roff
  text/turtle                                    ttl
-text/uri-list
+text/ulpfec
+text/uri-list                                  uris uri
  text/vcard                                     vcf vcard
-text/vnd.abc
-text/vnd.curl
-text/vnd.debian.copyright
-text/vnd.DMClientScript
-text/vnd.flatland.3dml
-text/vnd.fly
-text/vnd.fmi.flexstor
-text/vnd.in3d.3dml
-text/vnd.in3d.spot
+text/vnd.a                                     a
+text/vnd.abc                                   abc
+text/vnd.ascii-art                             ascii
+text/vnd.curl                                  curl
+text/vnd.debian.copyright                      copyright
+text/vnd.DMClientScript                                dms
+text/vnd.dvb.subtitle
+text/vnd.esmertec.theme-descriptor             jtd
+text/vnd.familysearch.gedcom                   ged
+text/vnd.ficlab.flt                            flt
+text/vnd.fly                                   fly
+text/vnd.fmi.flexstor                          flx
+text/vnd.gml
+text/vnd.graphviz                              gv dot
+text/vnd.hans                                  hans
+text/vnd.hgl                                   hgl
+text/vnd.in3d.3dml                             3dml 3dm
+text/vnd.in3d.spot                             spot spo
  text/vnd.IPTC.NewsML
  text/vnd.IPTC.NITF
  text/vnd.latex-z
  text/vnd.motorola.reflex
-text/vnd.ms-mediapackage
+text/vnd.ms-mediapackage                       mpf
+text/vnd.net2phone.commcenter.command          ccc
+text/vnd.radisys.msml-basic-layout
+text/vnd.senx.warpscript                       mc2
+text/vnd.sosi                                  sos
  text/vnd.sun.j2me.app-descriptor               jad
-text/vnd.wap.si
-text/vnd.wap.sl
+text/vnd.trolltech.linguist                    ts
+text/vnd.wap.si                                        si
+text/vnd.wap.sl                                        sl
  text/vnd.wap.wml                               wml
  text/vnd.wap.wmlscript                         wmls
+text/vtt                                       vtt
  text/x-bibtex                                  bib
  text/x-boo                                     boo
  text/x-c++hdr                                  h++ hpp hxx hh
  text/x-c++src                                  c++ cpp cxx cc
  text/x-chdr                                    h
  text/x-component                               htc
-text/x-crontab
  text/x-csh                                     csh
  text/x-csrc                                    c
-text/x-dsrc                                    d
  text/x-diff                                    diff patch
+text/x-dsrc                                    d
  text/x-haskell                                 hs
  text/x-java                                    java
  text/x-lilypond                                        ly
  text/x-literate-haskell                                lhs
-text/x-makefile
  text/x-moc                                     moc
  text/x-pascal                                  p pas
  text/x-pcs-gcd                                 gcd
  text/x-perl                                    pl pm
  text/x-python                                  py
  text/x-scala                                   scala
-text/x-server-parsed-html
  text/x-setext                                  etx
  text/x-sfv                                     sfv
  text/x-sh                                      sh
  text/x-tcl                                     tcl tk
  text/x-tex                                     tex ltx sty cls
  text/x-vcalendar                               vcs
+text/xml
+text/xml-dtd
+text/xml-external-parsed-entity
  
-video/3gpp                                     3gp
+video/1d-interleaved-parityfec
+video/3gpp
+video/3gpp-tt
+video/3gpp2
  video/annodex                                  axv
+video/AV1
+video/BMPEG
+video/BT656
+video/CelB
  video/dl                                       dl
+video/DV
  video/dv                                       dif dv
+video/encaprtp
+video/example
+video/FFV1
+video/flexfec
  video/fli                                      fli
  video/gl                                       gl
-video/mpeg                                     mpeg mpg mpe
-video/MP2T                                     ts
-video/mp4                                      mp4
-video/quicktime                                        qt mov
-video/mp4v-es
+video/H261
+video/H263
+video/H263-1998
+video/H263-2000
+video/H264
+video/H264-RCDO
+video/H264-SVC
+video/H265
+video/iso.segment                              m4s
+video/JPEG
+video/jpeg2000
+video/jxsv
+video/mj2                                      mj2 mjp2
+video/MP1S
+video/MP2P
+video/MP2T
+video/mp4                                      mp4 mpg4 m4v
+video/MP4V-ES
+video/mpeg                                     mpeg mpg mpe m1v m2v
+video/mpeg4-generic
+video/MPV
+video/nv
  video/ogg                                      ogv
  video/parityfec
  video/pointer
-video/webm                                     webm
-video/vnd.fvt
+video/quicktime                                        qt mov
+video/raptorfec
+video/raw
+video/rtp-enc-aescm128
+video/rtploopback
+video/rtx
+video/scip
+video/smpte291
+video/SMPTE292M
+video/ulpfec
+video/vc1
+video/vc2
+video/vnd.CCTV
+video/vnd.dece.hd                              uvh uvvh
+video/vnd.dece.mobile                          uvm uvvm
+video/vnd.dece.mp4                             uvu uvvu
+video/vnd.dece.pd                              uvp uvvp
+video/vnd.dece.sd                              uvs uvvs
+video/vnd.dece.video                           uvv uvvv
+video/vnd.directv.mpeg
+video/vnd.directv.mpeg-tts
+video/vnd.dlna.mpeg-tts
+video/vnd.dvb.file                             dvb
+video/vnd.fvt                                  fvt
+video/vnd.hns.video
+video/vnd.iptvforum.1dparityfec-1010
+video/vnd.iptvforum.1dparityfec-2005
+video/vnd.iptvforum.2dparityfec-1010
+video/vnd.iptvforum.2dparityfec-2005
+video/vnd.iptvforum.ttsavc
+video/vnd.iptvforum.ttsmpeg2
  video/vnd.motorola.video
  video/vnd.motorola.videop
-video/vnd.mpegurl                              mxu
-video/vnd.mts
-video/vnd.nokia.interleaved-multimedia
-video/vnd.vivo
+video/vnd.mpegurl                              mxu m4u
+video/vnd.ms-playready.media.pyv               pyv
+video/vnd.nokia.interleaved-multimedia         nim
+video/vnd.nokia.mp4vr
+video/vnd.nokia.videovoip
+video/vnd.objectvideo
+video/vnd.radgamettools.bink                   bik bk2
+video/vnd.radgamettools.smacker                        smk
+video/vnd.sealed.mpeg1                         smpg s11
+video/vnd.sealed.mpeg4                         s14
+video/vnd.sealed.swf                           sswf ssw
+video/vnd.sealedmedia.softseal.mov             smov smo s1q
+video/vnd.uvvu.mp4
+video/vnd.vivo                                 viv
+video/vnd.youtube.yt                           yt
+video/VP8
+video/VP9
+video/webm                                     webm
  video/x-flv                                    flv
  video/x-la-asf                                 lsf lsx
+video/x-matroska                               mpv mkv
  video/x-mng                                    mng
-video/x-ms-asf                                 asf asx
  video/x-ms-wm                                  wm
  video/x-ms-wmv                                 wmv
  video/x-ms-wmx                                 wmx
  video/x-ms-wvx                                 wvx
  video/x-msvideo                                        avi
  video/x-sgi-movie                              movie
-video/x-matroska                               mpv mkv
-
-x-conference/x-cooltalk                                ice
-
-x-epoc/x-sisx-app                              sisx
-x-world/x-vrml                                 vrm vrml wrl
diff --git a/mysql/mariadb.cnf b/mysql/mariadb.cnf

index 94d8f107a0494d32df72595e69c23f29830a25f8..62b4ea8f11ea8331a848a212da065f73615ed86a 100644 (file)
--- a/mysql/mariadb.cnf
+++ b/mysql/mariadb.cnf
@@ -1,6 +1,7 @@
  # The MariaDB configuration file
  #
  # The MariaDB/MySQL tools read configuration files in the following order:
+# 0. "/etc/mysql/my.cnf" symlinks to this file, reason why all the rest is read.
  # 1. "/etc/mysql/mariadb.cnf" (this file) to set global defaults,
  # 2. "/etc/mysql/conf.d/*.cnf" to set global options.
  # 3. "/etc/mysql/mariadb.conf.d/*.cnf" to set MariaDB-only options.
@@ -11,12 +12,17 @@
  # One can use all long options that the program supports.
  # Run program with --help to get a list of available options and with
  # --print-defaults to see which it would actually understand and use.
+#
+# If you are new to MariaDB, check out https://mariadb.com/kb/en/basic-mariadb-articles/
  
  #
-# This group is read both both by the client and the server
+# This group is read both by the client and the server
  # use it for options that affect everything
  #
  [client-server]
+# Port or socket location where to connect
+# port = 3306
+socket = /run/mysqld/mysqld.sock
  
  # Import all .cnf files from configuration directory
  !includedir /etc/mysql/conf.d/
diff --git a/network/if-down.d/bridge b/network/if-down.d/bridge

new file mode 120000 (symlink)

index 0000000..72c292f
--- /dev/null
+++ b/network/if-down.d/bridge
@@ -0,0 +1 @@
+/lib/bridge-utils/ifupdown.sh
+\ No newline at end of file
diff --git a/network/if-post-down.d/avahi-daemon b/network/if-post-down.d/avahi-daemon

deleted file mode 120000 (symlink)

index 3cf33d0..0000000
--- a/network/if-post-down.d/avahi-daemon
+++ /dev/null
@@ -1 +0,0 @@
-../if-up.d/avahi-daemon
-\ No newline at end of file
diff --git a/network/if-up.d/avahi-daemon b/network/if-up.d/avahi-daemon

deleted file mode 100755 (executable)

index ee8f388..0000000
--- a/network/if-up.d/avahi-daemon
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Don't run the avahi-daemon unicast local check while bringing up
-# the loopback device; it's not necessary until we bring up a real network
-# device
-[ "$IFACE" != "lo" ] || exit 0
-case "$ADDRFAM" in
-       inet|inet6) ;;
-       *) exit 0 ;;
-esac
-
-# If we have an unicast .local domain, we immediately disable avahi to avoid
-# conflicts with the multicast IP4LL .local domain
-if [ -x /usr/lib/avahi/avahi-daemon-check-dns.sh ] ; then
-       exec /usr/lib/avahi/avahi-daemon-check-dns.sh
-fi
diff --git a/pam.d/common-auth b/pam.d/common-auth

index cc4f2415ff5d75e51b409c4b41bf8a65f216fee1..8fcb7b00b97f7355e0c301e7e52c684b44b1544f 100644 (file)
--- a/pam.d/common-auth
+++ b/pam.d/common-auth
@@ -23,5 +23,4 @@ auth  requisite                       pam_deny.so
  auth   required                        pam_permit.so
  # and here are more per-package modules (the "Additional" block)
  auth   optional        pam_ecryptfs.so unwrap
-auth   optional                        pam_cap.so 
  # end of pam-auth-update config
diff --git a/pam.d/common-password b/pam.d/common-password

index bc13a55657085d1296ebb5ed3d0fa90e379722e5..e89970d466e14fd17f4425b3aec9b78161df7e99 100644 (file)
--- a/pam.d/common-password
+++ b/pam.d/common-password
@@ -6,14 +6,14 @@
  # used to change user passwords.  The default is pam_unix.
  
  # Explanation of pam_unix options:
-#
-# The "sha512" option enables salted SHA512 passwords.  Without this option,
-# the default is Unix crypt.  Prior releases used the option "md5".
-#
-# The "obscure" option replaces the old `OBSCURE_CHECKS_ENAB' option in
-# login.defs.
-#
-# See the pam_unix manpage for other options.
+# The "yescrypt" option enables
+#hashed passwords using the yescrypt algorithm, introduced in Debian
+#11.  Without this option, the default is Unix crypt.  Prior releases
+#used the option "sha512"; if a shadow password hash will be shared
+#between Debian 11 and older releases replace "yescrypt" with "sha512"
+#for compatibility .  The "obscure" option replaces the old
+#`OBSCURE_CHECKS_ENAB' option in login.defs.  See the pam_unix manpage
+#for other options.
  
  # As of pam 1.0.1-6, this file is managed by pam-auth-update by default.
  # To take advantage of this, it is recommended that you configure any
@@ -22,7 +22,7 @@
  # pam-auth-update(8) for details.
  
  # here are the per-package modules (the "Primary" block)
-password       [success=1 default=ignore]      pam_unix.so obscure sha512
+password       [success=1 default=ignore]      pam_unix.so obscure yescrypt
  # here's the fallback if no module succeeds
  password       requisite                       pam_deny.so
  # prime the stack with a positive return value if there isn't one already;
diff --git a/pam.d/su b/pam.d/su

index d5c6903a93c913a6fa0718cd1bca6fa146e1b596..6729598523399be89c382674b11c9df32811b3c0 100644 (file)
--- a/pam.d/su
+++ b/pam.d/su
@@ -5,10 +5,10 @@
  # This allows root to su without passwords (normal operation)
  auth       sufficient pam_rootok.so
  
-# Uncomment this to force users to be a member of group root
+# Uncomment this to force users to be a member of group wheel
  # before they can use `su'. You can also add "group=foo"
  # to the end of this line if you want to use a group other
-# than the default "root" (but this may have side effect of
+# than the default "wheel" (but this may have side effect of
  # denying "root" user, unless she's a member of "foo" or explicitly
  # permitted earlier by e.g. "sufficient pam_rootok.so").
  # (Replaces the `SU_WHEEL_ONLY' option from login.defs)
diff --git a/pam.d/systemd-user b/pam.d/systemd-user

deleted file mode 100644 (file)

index 45b2e5e..0000000
--- a/pam.d/systemd-user
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is part of systemd.
-#
-# Used by systemd --user instances.
-
-@include common-account
-
-session  required pam_selinux.so close
-session  required pam_selinux.so nottys open
-session  required pam_loginuid.so
-session  required pam_limits.so
-@include common-session-noninteractive
-session optional pam_systemd.so
diff --git a/passwd b/passwd

index 7f0f77b796c33a419862d642de62dd5776452edd..c3c3cc44889e432c00d313142eba3d78cc779448 100644 (file)
--- a/passwd
+++ b/passwd
@@ -13,7 +13,7 @@ proxy:x:13:13:proxy:/bin:/usr/sbin/nologin
  www-data:x:33:33:www-data:/var/www:/usr/sbin/nologin
  backup:x:34:34:backup:/var/backups:/usr/sbin/nologin
  list:x:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin
-irc:x:39:39:ircd:/var/run/ircd:/usr/sbin/nologin
+irc:x:39:39:ircd:/run/ircd:/usr/sbin/nologin
  gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/usr/sbin/nologin
  nobody:x:65534:65534:nobody:/nonexistent:/usr/sbin/nologin
  systemd-network:x:100:102:systemd Network Management,,,:/run/systemd/netif:/usr/sbin/nologin
diff --git a/passwd.org b/passwd.org

new file mode 100644 (file)

index 0000000..7f0f77b
--- /dev/null
+++ b/passwd.org
@@ -0,0 +1,69 @@
+root:x:0:0:root:/root:/bin/bash
+daemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin
+bin:x:2:2:bin:/bin:/usr/sbin/nologin
+sys:x:3:3:sys:/dev:/usr/sbin/nologin
+sync:x:4:65534:sync:/bin:/bin/sync
+games:x:5:60:games:/usr/games:/usr/sbin/nologin
+man:x:6:12:man:/var/cache/man:/usr/sbin/nologin
+lp:x:7:7:lp:/var/spool/lpd:/usr/sbin/nologin
+mail:x:8:8:mail:/var/mail:/usr/sbin/nologin
+news:x:9:9:news:/var/spool/news:/usr/sbin/nologin
+uucp:x:10:10:uucp:/var/spool/uucp:/usr/sbin/nologin
+proxy:x:13:13:proxy:/bin:/usr/sbin/nologin
+www-data:x:33:33:www-data:/var/www:/usr/sbin/nologin
+backup:x:34:34:backup:/var/backups:/usr/sbin/nologin
+list:x:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin
+irc:x:39:39:ircd:/var/run/ircd:/usr/sbin/nologin
+gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/usr/sbin/nologin
+nobody:x:65534:65534:nobody:/nonexistent:/usr/sbin/nologin
+systemd-network:x:100:102:systemd Network Management,,,:/run/systemd/netif:/usr/sbin/nologin
+systemd-resolve:x:101:103:systemd Resolver,,,:/run/systemd/resolve:/usr/sbin/nologin
+syslog:x:102:106::/home/syslog:/usr/sbin/nologin
+messagebus:x:103:107::/nonexistent:/usr/sbin/nologin
+_apt:x:104:65534::/nonexistent:/usr/sbin/nologin
+uuidd:x:105:111::/run/uuidd:/usr/sbin/nologin
+cups-pk-helper:x:106:112:user for cups-pk-helper service,,,:/home/cups-pk-helper:/usr/sbin/nologin
+kernoops:x:107:65534:Kernel Oops Tracking Daemon,,,:/:/usr/sbin/nologin
+rtkit:x:108:113:RealtimeKit,,,:/proc:/usr/sbin/nologin
+avahi-autoipd:x:109:114:Avahi autoip daemon,,,:/var/lib/avahi-autoipd:/usr/sbin/nologin
+usbmux:x:110:46:usbmux daemon,,,:/var/lib/usbmux:/usr/sbin/nologin
+systemd-coredump:x:111:117:systemd core dump processing,,,:/run/systemd:/usr/sbin/nologin
+lightdm:x:113:119:Light Display Manager:/var/lib/lightdm:/bin/false
+dnsmasq:x:114:65534:dnsmasq,,,:/var/lib/misc:/usr/sbin/nologin
+saned:x:115:122::/var/lib/saned:/usr/sbin/nologin
+nm-openvpn:x:116:123:NetworkManager OpenVPN,,,:/var/lib/openvpn/chroot:/usr/sbin/nologin
+avahi:x:117:124:Avahi mDNS daemon,,,:/var/run/avahi-daemon:/usr/sbin/nologin
+colord:x:118:125:colord colour management daemon,,,:/var/lib/colord:/usr/sbin/nologin
+speech-dispatcher:x:119:29:Speech Dispatcher,,,:/var/run/speech-dispatcher:/bin/false
+pulse:x:120:126:PulseAudio daemon,,,:/var/run/pulse:/usr/sbin/nologin
+hplip:x:121:7:HPLIP system user,,,:/var/run/hplip:/bin/false
+geoclue:x:122:128::/var/lib/geoclue:/usr/sbin/nologin
+frank:x:1000:100:Frank Brehm,,,:/home/frank:/bin/bash
+sshd:x:123:65534::/run/sshd:/usr/sbin/nologin
+bind:x:124:130::/var/cache/bind:/usr/sbin/nologin
+postfix:x:125:131::/var/spool/postfix:/usr/sbin/nologin
+doris:x:1003:100:Doris Hennig:/home/doris:/bin/sh
+davis:x:1123:100:Davis Musterer:/home/davis:/bin/sh
+heiko:x:1005:100:Heiko Hennig:/home/heiko:/bin/sh
+patrick:x:1004:100:Patrick Hennig:/home/patrick:/bin/sh
+robert:x:1007:100:Robert Meusel:/home/robert:/bin/sh
+steffen:x:1008:100:Steffen Brehm:/home/steffen:/bin/sh
+thomas:x:1002:100:Thomas Schmidt:/home/thomas:/bin/sh
+vivi:x:1006:100:Vivien Musterer:/home/vivi:/bin/sh
+kameu:x:1001:100:Karin Meusel:/home/kameu:/bin/sh
+plex:x:136:963:Plex Media Server:/var/lib/plexmediaserver:/bin/sh
+_chrony:x:126:135:Chrony daemon,,,:/var/lib/chrony:/usr/sbin/nologin
+gdm:x:112:118:Gnome Display Manager:/var/lib/gdm3:/bin/false
+libvirt-qemu:x:64055:133:Libvirt Qemu,,,:/var/lib/libvirt:/usr/sbin/nologin
+libvirt-dnsmasq:x:127:137:Libvirt Dnsmasq,,,:/var/lib/libvirt/dnsmasq:/usr/sbin/nologin
+mysql:x:128:138:MySQL Server,,,:/nonexistent:/bin/false
+statd:x:129:65534::/var/lib/nfs:/usr/sbin/nologin
+ulog:x:130:144::/var/log/ulog:/bin/false
+vde2-net:x:131:145::/var/run/vde2:/usr/sbin/nologin
+smbguest:x:1125:1000:Samba guest account:/dev/null:/dev/null
+gast:x:1126:1126:Samba User Account:/dev/null:/dev/null
+tcpdump:x:132:147::/nonexistent:/usr/sbin/nologin
+_rpc:x:133:65534::/run/rpcbind:/usr/sbin/nologin
+tss:x:134:149:TPM software stack,,,:/var/lib/tpm:/bin/false
+_flatpak:x:135:150:Flatpak system-wide installation helper,,,:/nonexistent:/usr/sbin/nologin
+systemd-timesync:x:999:999:systemd Time Synchronization:/:/usr/sbin/nologin
diff --git a/perl/XML/SAX/ParserDetails.ini b/perl/XML/SAX/ParserDetails.ini

index 7f82e6d0df81eec0785ea7fae8162248cea919b9..254603f780549c4fd137eda163da0c61c5516e98 100644 (file)
--- a/perl/XML/SAX/ParserDetails.ini
+++ b/perl/XML/SAX/ParserDetails.ini
@@ -2,14 +2,6 @@
  http://xml.org/sax/features/namespaces = 1
  
  
-[XML::LibXML::SAX]
-http://xml.org/sax/features/namespaces = 1
-
-
-[XML::LibXML::SAX::Parser]
-http://xml.org/sax/features/namespaces = 1
-
-
  [XML::SAX::Expat]
  http://xml.org/sax/features/namespaces = 1
  http://xml.org/sax/features/external-parameter-entities = 1
diff --git a/postfix/dynamicmaps.cf b/postfix/dynamicmaps.cf

index 527523ee99935429a601eada50d0ed499f120860..1b6c95a7b75de87114d30d8215589761c465fc1d 100644 (file)
--- a/postfix/dynamicmaps.cf
+++ b/postfix/dynamicmaps.cf
@@ -1,7 +1 @@
  # dict-type    so-name (pathname)      dict-function   mkmap-function
-cdb    postfix-cdb.so  dict_cdb_open   mkmap_cdb_open
-ldap   postfix-ldap.so dict_ldap_open  
-pcre   postfix-pcre.so dict_pcre_open  
-pgsql  postfix-pgsql.so        dict_pgsql_open 
-sqlite postfix-sqlite.so       dict_sqlite_open        
-mysql  postfix-mysql.so        dict_mysql_open 
diff --git a/printcap b/printcap

deleted file mode 120000 (symlink)

index 9540cf1..0000000
--- a/printcap
+++ /dev/null
@@ -1 +0,0 @@
-/run/cups/printcap
-\ No newline at end of file
diff --git a/profile b/profile

index 259b3b46c4b1efcabad1dcd84ae649a2c532423b..7f85066c60079da983f1977c3e311cadec00b5f2 100644 (file)
--- a/profile
+++ b/profile
@@ -9,7 +9,7 @@ if [ "${PS1-}" ]; then
        . /etc/bash.bashrc
      fi
    else
-    if [ "`id -u`" -eq 0 ]; then
+    if [ "$(id -u)" -eq 0 ]; then
        PS1='# '
      else
        PS1='$ '
diff --git a/profile.d/vte-2.91.sh b/profile.d/vte-2.91.sh

index 8fa219e741fe4077b9d954db81349bedfce8fcc2..af6eedc4803a348e4df0982dfb3317e8c02a5849 100644 (file)
--- a/profile.d/vte-2.91.sh
+++ b/profile.d/vte-2.91.sh
@@ -11,10 +11,10 @@
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
  
  # Not bash or zsh?
-[ -n "$BASH_VERSION" -o -n "$ZSH_VERSION" ] || return 0
+[ -n "${BASH_VERSION:-}" -o -n "${ZSH_VERSION:-}" ] || return 0
  
  # Not an interactive shell?
  [[ $- == *i* ]] || return 0
@@ -22,6 +22,12 @@
  # Not running under vte?
  [ "${VTE_VERSION:-0}" -ge 3405 ] || return 0
  
+# TERM not supported?
+case "$TERM" in
+    xterm*|vte*|gnome*) :;;
+    *) return 0 ;;
+esac
+
  __vte_osc7 () {
    printf "\033]7;file://%s%s\033\\" "${HOSTNAME}" "$(/usr/libexec/vte-urlencode-cwd)"
  }
@@ -34,11 +40,22 @@ __vte_prompt_command() {
    __vte_osc7
  }
  
-case "$TERM" in
-  xterm*|vte*)
-    [ -n "$BASH_VERSION" ] && PROMPT_COMMAND="__vte_prompt_command"
-    [ -n "$ZSH_VERSION"  ] && precmd_functions+=(__vte_osc7)
-    ;;
-esac
+if [[ -n "${BASH_VERSION:-}" ]]; then
+
+    # Newer bash versions support PROMPT_COMMAND as an array. In this case
+    # only add the __vte_osc7 function to it, and leave setting the terminal
+    # title to the outside setup.
+    # On older bash, we can only overwrite the whole PROMPT_COMMAND, so must
+    # use the __vte_prompt_command function which also sets the title.
+
+    if [[ "$(declare -p PROMPT_COMMAND 2>&1)" =~ "declare -a" ]]; then
+       PROMPT_COMMAND+=(__vte_osc7)
+    else
+       PROMPT_COMMAND="__vte_prompt_command"
+    fi
+
+elif [[ -n "${ZSH_VERSION:-}" ]]; then
+    precmd_functions+=(__vte_osc7)
+fi
  
-true
+return 0
diff --git a/profile.d/vte.csh b/profile.d/vte.csh

index 3b07c5c7314f8f0c1450992dc03de0bb49de10b1..3422e187bef998625bf074bcd4d19057200a2794 100644 (file)
--- a/profile.d/vte.csh
+++ b/profile.d/vte.csh
@@ -11,7 +11,7 @@
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
  #
  # Red Hat Author(s): Carlos Santos
  
diff --git a/python3.10/sitecustomize.py b/python3.10/sitecustomize.py

new file mode 100644 (file)

index 0000000..89c6712
--- /dev/null
+++ b/python3.10/sitecustomize.py
@@ -0,0 +1,7 @@
+# install the apport exception handler if available
+try:
+    import apport_python_hook
+except ImportError:
+    pass
+else:
+    apport_python_hook.install()
diff --git a/rc2.d/S01mintsystem b/rc2.d/S01mintsystem

deleted file mode 120000 (symlink)

index 8884072..0000000
--- a/rc2.d/S01mintsystem
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mintsystem
-\ No newline at end of file
diff --git a/rc3.d/S01mintsystem b/rc3.d/S01mintsystem

deleted file mode 120000 (symlink)

index 8884072..0000000
--- a/rc3.d/S01mintsystem
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mintsystem
-\ No newline at end of file
diff --git a/rc4.d/S01mintsystem b/rc4.d/S01mintsystem

deleted file mode 120000 (symlink)

index 8884072..0000000
--- a/rc4.d/S01mintsystem
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mintsystem
-\ No newline at end of file
diff --git a/rc5.d/S01mintsystem b/rc5.d/S01mintsystem

deleted file mode 120000 (symlink)

index 8884072..0000000
--- a/rc5.d/S01mintsystem
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mintsystem
-\ No newline at end of file
diff --git a/resolvconf/update-libc.d/avahi-daemon b/resolvconf/update-libc.d/avahi-daemon

deleted file mode 100755 (executable)

index 7b70815..0000000
--- a/resolvconf/update-libc.d/avahi-daemon
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# If we have an unicast .local domain, we immediately disable avahi to avoid
-# conflicts with the multicast IP4LL .local domain
-
-if [ -x /usr/lib/avahi/avahi-daemon-check-dns.sh ]; then
-  exec /usr/lib/avahi/avahi-daemon-check-dns.sh
-fi
diff --git a/security/namespace.conf b/security/namespace.conf

index b611a0f218163a7c684421ab05928b358cf3e505..75ec61938080ddcc977b38ef0a9c7c1476bda7ea 100644 (file)
--- a/security/namespace.conf
+++ b/security/namespace.conf
@@ -21,7 +21,10 @@
  # is explicitly called with an argument to ignore the mode of the
  # instance parent. System administrators should use this argument with
  # caution, as it will reduce security and isolation achieved by
-# polyinstantiation.
+# polyinstantiation. The parent directories (except $HOME) are created
+# at boot by pam_namespace_helper, but in a live system, system
+# administrators should create the parent directories before enabling
+# them here.
  #
  #/tmp     /tmp-inst/           level      root,adm
  #/var/tmp /var/tmp/tmp-inst/           level      root,adm
diff --git a/security/pam_env.conf b/security/pam_env.conf

index 30e9d00894eb2fb2fe45986af7687a7107e5b5af..2549e430519c8b61d475c53d2e9d210a121b5db7 100644 (file)
--- a/security/pam_env.conf
+++ b/security/pam_env.conf
@@ -26,7 +26,7 @@
  #
  # Each line starts with the variable name, there are then two possible
  # options for each variable DEFAULT and OVERRIDE.
-# DEFAULT allows and administrator to set the value of the
+# DEFAULT allows an administrator to set the value of the
  # variable  to some default value, if none is supplied then the empty
  # string is assumed. The OVERRIDE option tells pam_env that it should
  # enter in its value (overriding the default value) if there is one
diff --git a/services b/services

index 1c0643602896599085b0237fc5e9dbe6861a7b7e..f90e9de67987064565cab0035f0b7d5f8db4e5be 100644 (file)
--- a/services
+++ b/services
@@ -1,9 +1,5 @@
  # Network services, Internet style
  #
-# Note that it is presently the policy of IANA to assign a single well-known
-# port number for both TCP and UDP; hence, officially ports have two entries
-# even if the protocol doesn't support UDP operations.
-#
  # Updated from https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml .
  #
  # New ports will be added on request if they have been officially assigned
@@ -52,12 +48,9 @@ auth         113/tcp         authentication tap ident
  nntp           119/tcp         readnews untp   # USENET News Transfer Protocol
  ntp            123/udp                         # Network Time Protocol
  epmap          135/tcp         loc-srv         # DCE endpoint resolution
-netbios-ns     137/tcp                         # NETBIOS Name Service
-netbios-ns     137/udp
-netbios-dgm    138/tcp                         # NETBIOS Datagram Service
-netbios-dgm    138/udp
+netbios-ns     137/udp                         # NETBIOS Name Service
+netbios-dgm    138/udp                         # NETBIOS Datagram Service
  netbios-ssn    139/tcp                         # NETBIOS session service
-netbios-ssn    139/udp
  imap2          143/tcp         imap            # Interim Mail Access P 2 and 4
  snmp           161/tcp                         # Simple Net Mgmt Protocol
  snmp           161/udp
@@ -88,9 +81,9 @@ ldap          389/udp
  svrloc         427/tcp                         # Server Location
  svrloc         427/udp
  https          443/tcp                         # http protocol over TLS/SSL
+https          443/udp                         # HTTP/3
  snpp           444/tcp                         # Simple Network Paging Protocol
  microsoft-ds   445/tcp                         # Microsoft Naked CIFS
-microsoft-ds   445/udp
  kpasswd                464/tcp
  kpasswd                464/udp
  submissions    465/tcp         ssmtp smtps urd # Submission over TLS [RFC8314]
@@ -102,6 +95,8 @@ nqs          607/tcp                         # Network Queuing system
  asf-rmcp       623/udp         # ASF Remote Management and Control Protocol
  qmqp           628/tcp
  ipp            631/tcp                         # Internet Printing Protocol
+ldp            646/tcp                         # Label Distribution Protocol
+ldp            646/udp
  #
  # UNIX specific services
  #
@@ -163,9 +158,7 @@ openvpn             1194/udp
  rmiregistry    1099/tcp                        # Java RMI Registry
  lotusnote      1352/tcp        lotusnotes      # Lotus Note
  ms-sql-s       1433/tcp                        # Microsoft SQL Server
-ms-sql-s       1433/udp
-ms-sql-m       1434/tcp                        # Microsoft SQL Monitor
-ms-sql-m       1434/udp
+ms-sql-m       1434/udp                        # Microsoft SQL Monitor
  ingreslock     1524/tcp
  datametrics    1645/tcp        old-radius
  datametrics    1645/udp        old-radius
@@ -203,8 +196,7 @@ f5-globalsite       2792/tcp
  gsiftp         2811/tcp
  gpsd           2947/tcp
  gds-db         3050/tcp        gds_db          # InterBase server
-icpv2          3130/tcp        icp             # Internet Cache Protocol
-icpv2          3130/udp        icp
+icpv2          3130/udp        icp             # Internet Cache Protocol
  isns           3205/tcp                        # iSNS Server Port
  isns           3205/udp                        # iSNS Server Port
  iscsi-target   3260/tcp
@@ -213,29 +205,19 @@ ms-wbt-server     3389/tcp
  nut            3493/tcp                        # Network UPS Tools
  nut            3493/udp
  distcc         3632/tcp                        # distributed compiler
-distcc         3632/udp
  daap           3689/tcp                        # Digital Audio Access Protocol
-daap           3689/udp
  svn            3690/tcp        subversion      # Subversion protocol
-svn            3690/udp        subversion
  suucp          4031/tcp                        # UUCP over SSL
-suucp          4031/udp
  sysrqd         4094/tcp                        # sysrq daemon
-sysrqd         4094/udp
  sieve          4190/tcp                        # ManageSieve Protocol
  epmd           4369/tcp                        # Erlang Port Mapper Daemon
-epmd           4369/udp
  remctl         4373/tcp                # Remote Authenticated Command Service
-remctl         4373/udp
  f5-iquery      4353/tcp                        # F5 iQuery
-f5-iquery      4353/udp
+ntske          4460/tcp        # Network Time Security Key Establishment
  ipsec-nat-t    4500/udp                        # IPsec NAT-Traversal [RFC3947]
-iax            4569/tcp                        # Inter-Asterisk eXchange
-iax            4569/udp
+iax            4569/udp                        # Inter-Asterisk eXchange
  mtn            4691/tcp                        # monotone Netsync Protocol
-mtn            4691/udp
  radmin-port    4899/tcp                        # RAdmin Port
-radmin-port    4899/udp
  sip            5060/tcp                        # Session Initiation Protocol
  sip            5060/udp
  sip-tls                5061/tcp
@@ -248,7 +230,6 @@ postgresql  5432/tcp        postgres        # PostgreSQL Database
  freeciv                5556/tcp        rptp            # Freeciv gameplay
  amqps          5671/tcp                        # AMQP protocol over TLS/SSL
  amqp           5672/tcp
-amqp           5672/udp
  amqp           5672/sctp
  x11            6000/tcp        x11-0           # X Window System
  x11-1          6001/tcp
@@ -262,31 +243,22 @@ gnutella-svc      6346/tcp                        # gnutella
  gnutella-svc   6346/udp
  gnutella-rtr   6347/tcp                        # gnutella
  gnutella-rtr   6347/udp
+redis          6379/tcp
  sge-qmaster    6444/tcp        sge_qmaster     # Grid Engine Qmaster Service
  sge-execd      6445/tcp        sge_execd       # Grid Engine Execution Service
  mysql-proxy    6446/tcp                        # MySQL Proxy
  babel          6696/udp                        # Babel Routing Protocol
  ircs-u         6697/tcp                # Internet Relay Chat via TLS/SSL
-afs3-fileserver 7000/tcp       bbs             # file server itself
-afs3-fileserver 7000/udp       bbs
-afs3-callback  7001/tcp                        # callbacks to cache managers
-afs3-callback  7001/udp
-afs3-prserver  7002/tcp                        # users & groups database
-afs3-prserver  7002/udp
-afs3-vlserver  7003/tcp                        # volume location database
-afs3-vlserver  7003/udp
-afs3-kaserver  7004/tcp                        # AFS/Kerberos authentication
-afs3-kaserver  7004/udp
-afs3-volser    7005/tcp                        # volume managment server
-afs3-volser    7005/udp
-afs3-errors    7006/tcp                        # error interpretation service
-afs3-errors    7006/udp
-afs3-bos       7007/tcp                        # basic overseer process
-afs3-bos       7007/udp
-afs3-update    7008/tcp                        # server-to-server updater
-afs3-update    7008/udp
-afs3-rmtsys    7009/tcp                        # remote cache manager service
-afs3-rmtsys    7009/udp
+bbs            7000/tcp
+afs3-fileserver 7000/udp
+afs3-callback  7001/udp                        # callbacks to cache managers
+afs3-prserver  7002/udp                        # users & groups database
+afs3-vlserver  7003/udp                        # volume location database
+afs3-kaserver  7004/udp                        # AFS/Kerberos authentication
+afs3-volser    7005/udp                        # volume managment server
+afs3-bos       7007/udp                        # basic overseer process
+afs3-update    7008/udp                        # server-to-server updater
+afs3-rmtsys    7009/udp                        # remote cache manager service
  font-service   7100/tcp        xfs             # X Font Service
  http-alt       8080/tcp        webcache        # WWW caching service
  puppet         8140/tcp                        # The Puppet master service
@@ -335,7 +307,6 @@ supfiledbg  1127/tcp                # Software Upgrade Protocol debugging
  # Services added for the Debian GNU/Linux distribution
  #
  poppassd       106/tcp                         # Eudora
-poppassd       106/udp
  moira-db       775/tcp         moira_db        # Moira database
  moira-update   777/tcp         moira_update    # Moira update protocol
  moira-ureg     779/udp         moira_ureg      # Moira user registration
@@ -345,9 +316,6 @@ predict             1210/udp                        # predict -- satellite tracking
  rmtcfg         1236/tcp                        # Gracilis Packeten remote config server
  xtel           1313/tcp                        # french minitel
  xtelw          1314/tcp                        # french minitel
-support                1529/tcp                        # GNATS
-cfinger                2003/tcp                        # GNU Finger
-frox           2121/tcp                        # frox: caching ftp proxy
  zebrasrv       2600/tcp                        # zebra service
  zebra          2601/tcp                        # zebra vty
  ripd           2602/tcp                        # ripd vty (zebra)
@@ -357,26 +325,12 @@ bgpd              2605/tcp                        # bgpd vty (zebra)
  ospf6d         2606/tcp                        # ospf6d vty (zebra)
  ospfapi                2607/tcp                        # OSPF-API
  isisd          2608/tcp                        # ISISd vty (zebra)
-afbackup       2988/tcp                        # Afbackup system
-afbackup       2988/udp
-afmbackup      2989/tcp                        # Afmbackup system
-afmbackup      2989/udp
  fax            4557/tcp                        # FAX transmission service (old)
  hylafax                4559/tcp                        # HylaFAX client-server protocol (new)
-distmp3                4600/tcp                        # distmp3host daemon
  munin          4949/tcp        lrrd            # Munin
-enbd-cstatd    5051/tcp                        # ENBD client statd
-enbd-sstatd    5052/tcp                        # ENBD server statd
-pcrd           5151/tcp                        # PCR-1000 Daemon
-noclog         5354/tcp                        # noclogd with TCP (nocol)
-noclog         5354/udp                        # noclogd with UDP (nocol)
-hostmon                5355/tcp                        # hostmon uses TCP (nocol)
-hostmon                5355/udp                        # hostmon uses UDP (nocol)
  rplay          5555/udp                        # RPlay audio service
  nrpe           5666/tcp                        # Nagios Remote Plugin Executor
  nsca           5667/tcp                        # Nagios Agent - NSCA
-mrtd           5674/tcp                        # MRT Routing Daemon
-bgpsim         5675/tcp                        # MRT Routing Simulator
  canna          5680/tcp                        # cannaserver
  syslog-tls     6514/tcp                        # Syslog over TLS [RFC5425]
  sane-port      6566/tcp        sane saned      # SANE network scanner daemon
@@ -384,28 +338,18 @@ ircd              6667/tcp                        # Internet Relay Chat
  zope-ftp       8021/tcp                        # zope management by ftp
  tproxy         8081/tcp                        # Transparent Proxy
  omniorb                8088/tcp                        # OmniORB
-omniorb                8088/udp
  clc-build-daemon 8990/tcp                      # Common lisp build daemon
  xinetd         9098/tcp
-mandelspawn    9359/udp        mandelbrot      # network mandelbrot
  git            9418/tcp                        # Git Version Control System
  zope           9673/tcp                        # zope server
  webmin         10000/tcp
  kamanda                10081/tcp                       # amanda backup services (Kerberos)
  amandaidx      10082/tcp                       # amanda backup services
  amidxtape      10083/tcp                       # amanda backup services
-smsqp          11201/tcp                       # Alamin SMS gateway
-smsqp          11201/udp
-xpilot         15345/tcp                       # XPilot Contact Port
-xpilot         15345/udp
  sgi-cmsd       17001/udp               # Cluster membership services daemon
  sgi-crsd       17002/udp
  sgi-gcd                17003/udp                       # SGI Group membership daemon
  sgi-cad                17004/tcp                       # Cluster Admin daemon
-isdnlog                20011/tcp                       # isdn logging system
-isdnlog                20011/udp
-vboxd          20012/tcp                       # voice box system
-vboxd          20012/udp
  binkp          24554/tcp                       # binkp fidonet protocol
  asp            27374/tcp                       # Address Search Protocol
  asp            27374/udp
diff --git a/sgml/metacity-common.cat b/sgml/metacity-common.cat

deleted file mode 100644 (file)

index b9fa246..0000000
--- a/sgml/metacity-common.cat
+++ /dev/null
@@ -1 +0,0 @@
-CATALOG /usr/share/sgml/metacity-common/catalog
diff --git a/shadow.org b/shadow.org

new file mode 100644 (file)

index 0000000..8591018
--- /dev/null
+++ b/shadow.org
@@ -0,0 +1,69 @@
+root:$6$fJeC8Bmc$/e8AXwDnlShE1EMXUsW0WKTY7ozoDEEcgyegBBAzh4/Vq5c5qI3Mu3SSB/r9J2RlD5KJ9iXi9rihuPvQ2TFk/1:18399:0:99999:7:::
+daemon:*:18246:0:99999:7:::
+bin:*:18246:0:99999:7:::
+sys:*:18246:0:99999:7:::
+sync:*:18246:0:99999:7:::
+games:*:18246:0:99999:7:::
+man:*:18246:0:99999:7:::
+lp:*:18246:0:99999:7:::
+mail:*:18246:0:99999:7:::
+news:*:18246:0:99999:7:::
+uucp:*:18246:0:99999:7:::
+proxy:*:18246:0:99999:7:::
+www-data:*:18246:0:99999:7:::
+backup:*:18246:0:99999:7:::
+list:*:18246:0:99999:7:::
+irc:*:18246:0:99999:7:::
+gnats:*:18246:0:99999:7:::
+nobody:*:18246:0:99999:7:::
+systemd-network:*:18246:0:99999:7:::
+systemd-resolve:*:18246:0:99999:7:::
+syslog:*:18246:0:99999:7:::
+messagebus:*:18246:0:99999:7:::
+_apt:*:18246:0:99999:7:::
+uuidd:*:18246:0:99999:7:::
+cups-pk-helper:*:18246:0:99999:7:::
+kernoops:*:18246:0:99999:7:::
+rtkit:*:18246:0:99999:7:::
+avahi-autoipd:*:18246:0:99999:7:::
+usbmux:*:18246:0:99999:7:::
+systemd-coredump:*:18246:0:99999:7:::
+lightdm:*:18246:0:99999:7:::
+dnsmasq:*:18246:0:99999:7:::
+saned:*:18246:0:99999:7:::
+nm-openvpn:*:18246:0:99999:7:::
+avahi:*:18246:0:99999:7:::
+colord:*:18246:0:99999:7:::
+speech-dispatcher:!:18246:0:99999:7:::
+pulse:*:18246:0:99999:7:::
+hplip:*:18246:0:99999:7:::
+geoclue:*:18246:0:99999:7:::
+frank:$6$B9vdOwg3$FGETupX4vQ3JAcN4IKoEeA5ITcdU6PHu421SKsgINS4Hg51vksMoDw58HorDtzJntBufSaB/cQIFT2s7O6Scp.:18383:0:99999:7:::
+sshd:*:18383:0:99999:7:::
+bind:*:18383:0:99999:7:::
+postfix:*:18384:0:99999:7:::
+doris:$6$aaBD.v4x$kR6SRHU0BmEMnK5SVaU/UcHl.xw.pfq7naPf8Wb6xkA4c1ENK.9XKvc/Tj5iF4/9yQOYSgjR5iKiD7w7MMZhn1:15357:0:99999:7:::
+davis:$6$LGOGpMo7$IEac4EA0nNsTr7OeyFGgDkPm3QNmCX.oB43aVgnwWPFGItGxCY1zD2XlHWEy3fBYziCXI.vbwElYnwYzltzlt1:18008:0:99999:7:::
+heiko:$6$H4HqXLQP$C8z9qeK1thF1pEN.ABVIghuRwNU4eIVBLbEo3N7RcnEebwNevoulYo.mGH/tXcEfnE2WsVTILMpPH1FHKD5AK/:15590:0:99999:7:::
+patrick:$6$WigVTguB$swczs.5CwCYDwrNtibrWiNi27a3WITJi2hlAAAJgCJVa9bSh86AnxxQ9VBcz4z18y/DVMxssQ2SIhFCu1Ra9O/:18342:0:99999:7:::
+robert:$1$3dN7L0X7$wjwYf5TMs4XAzX8yA8iRz0:14147:0:99999:7:::
+steffen:$6$l6EVLY86$j9aCQ8smEOrsH/ccQM1r.qQXZxCBazpcCxQe0e1LKYl5oycf7gcBWB.Bx5kqw5gqS7MkiKik69TEAObmPNXfy0:14772:0:99999:7:::
+thomas:!:18385:0:99999:7:::
+vivi:!:18385:0:99999:7:::
+kameu:$6$5h/eHwOt$vHYM0Cxc6GsFbNjm5J4cdqjvmok6Ce9tSnP5Ox8MwDBHJ/ldTIId1ZGs4k8pa1OPgtMuw1yxvrwkAlvPrkJwQ/:17722:0:99999:7:::
+plex:!:18385:0:99999:7:::
+_chrony:*:18385:0:99999:7:::
+gdm:*:18385:0:99999:7:::
+libvirt-qemu:!:18385:0:99999:7:::
+libvirt-dnsmasq:!:18385:0:99999:7:::
+mysql:!:18386:0:99999:7:::
+statd:*:18393:0:99999:7:::
+ulog:*:18399:0:99999:7:::
+vde2-net:*:18399:0:99999:7:::
+smbguest:!:18434:0:99999:7:::
+gast:!:18434:0:99999:7:::
+tcpdump:*:18464:0:99999:7:::
+_rpc:*:18464:0:99999:7:::
+tss:*:18464:0:99999:7:::
+_flatpak:*:18464:0:99999:7:::
+systemd-timesync:!!:18464::::::
diff --git a/speech-dispatcher/modules/baratinoo.conf b/speech-dispatcher/modules/baratinoo.conf

deleted file mode 100644 (file)

index d0c23ad..0000000
--- a/speech-dispatcher/modules/baratinoo.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# Path to the Baratinoo configuration file.  Defaults to $BARATINOO_CONFIG_PATH
-# or XDG_CONFIG_HOME/baratinoo.cfg
-BaratinooConfigPath    "/etc/voxygen/baratinoo.cfg"
-
-# Characters to be spoken when punctuation setting is "some"
-# Encoding is UTF-8.
-BaratinooPunctuationList       "@+_"
-# Characters that should still influence intonation when punctuation is not "none"
-# Encoding is UTF-8.
-BaratinooIntonationList        "?!;:,.…"
-# Characters that should not be spoken when punctuation is "none"
-# (i.e. Baratinoo would not use them for intonation so we have to explicitly
-# drop them before giving text to it)
-# Encoding is UTF-8.
-BaratinooNoIntonationList ""
-
-# Sample rate, in Hz (in the 6000Hz-48000Hz range).  Default to 16000Hz which
-# is the actual voices rate, not requiring resampling.
-#BaratinooSampleRate    16000
-
-# Minimum rate (-100 in speech-dispatcher)
-BaratinooMinRate       -50
-# Normal rate (0 in speech-dispatcher)
-BaratinooNormalRate    0
-# Maximum rate (100 in speech-dispatcher)
-BaratinooMaxRate       150
-
-# Debug turns debugging on or off
-# See speechd.conf for information where debugging information is stored
-
-# Debug 0
-
-# DebugFile specifies the file where the debugging information
-# should be stored (note that the log is overwritten each time
-# the module starts)
-# DebugFile "/tmp/debug-baratinoo"
-
-
-# Copyright (C) 2017 Colomban Wendling <cwendling@hypra.fr>
-# Copyright (C) 2018 Samuel Thibault <samuel.thibault@ens-lyon.org>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
-# COPYING in the root directory).
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/espeak-generic.conf b/speech-dispatcher/modules/espeak-generic.conf

deleted file mode 100644 (file)

index 2300357..0000000
--- a/speech-dispatcher/modules/espeak-generic.conf
+++ /dev/null
@@ -1,142 +0,0 @@
-# Espeak output module is based on the generic plugin for Speech
-# Dispatcher. It means there is no C code written explicitly for
-# this plugin, all the specifics are handled in this configuration
-# and we call a simple command line client to perform the actual
-# synthesis. Use this config file with the sd_generic output module.
-#
-# IMPORTANT: The audio output method relies on ALSA Player (aplay)
-# being installed. If this is not the case, consider installing it
-# or replace the aplay command in the GenericExecuteString below
-# with play or similar.
-#
-# GenericExecuteString to what's the name of this utility on your
-# system (it might be "speak")
-
-# GenericExecuteSynth is the shell command that should be
-# executed in order to say some message. This command must
-# stop saying the message on SIGKILL, otherwise it's useless.
-# You can use the variables $LANGUAGE, $VOICE, $PITCH and $RATE
-# which will be substituted for the appropriate value (you
-# can modify this value, see other parameters).
-# The command can be split into more lines, if necessary, using '\'.
-GenericExecuteSynth \
-"echo \'$DATA\' | espeak -w $TMPDIR/espeak.wav -v $VOICE -s $RATE -a $VOLUME -p $PITCH $PUNCT --stdin && $PLAY_COMMAND $TMPDIR/espeak.wav"
-
-GenericCmdDependency "espeak"
-
-# The following three items control punctuation levels None, Some, and All.
-# Each of these values will be substituted into the $PUNCT variable depending
-# on the value passed to speech dispatcher from applications.
-# Note that if an empty string is specified, then $PUNCT will be blank 
-# which is a default situation for espeak.
- 
-GenericPunctNone ""
-GenericPunctSome "--punct=\"()[]{};:\""
-GenericPunctAll "--punct"
-
-# GenericStripPunctChars is a list (enclosed in doublequotes) of
-# all the characters that should be replaced by whitespaces in
-# order not to be badly handled by the output module or misinterpreted
-# by shell.
-
-# GenericStripPunctChars  ""
-
-# AddVoice specifies which $VOICE string should be assigned to
-# each language and symbolic voice name. All the voices you want
-# to use must be specified here. This list will likely not be
-# up-to-date, please check eSpeak documentation and add the voices
-# you want to use. Or better use the native espeak module ('espeak'
-# not 'espeak-generic')
-
-AddVoice        "en"    "MALE1"                "en"
-AddVoice       "en"    "MALE2"         "en-b"
-AddVoice       "en"    "MALE3"         "en-d"
-AddVoice       "en"    "FEMALE1"       "en-f"
-AddVoice       "en"    "FEMALE2"       "en-fb"
-AddVoice       "en"    "FEMALE3"       "en-fd"
-AddVoice       "en"    "CHILD_MALE"    "en-c"
-AddVoice       "en"    "CHILD_FEMALE"  "en-fc"
-AddVoice        "af"    "MALE1"                "af"
-AddVoice        "de"    "MALE1"                "de"
-AddVoice        "eo"    "MALE1"                "eo"
-AddVoice        "es"    "MALE1"                "es"
-AddVoice        "fi"    "MALE1"                "fi"
-AddVoice        "fr"    "MALE1"                "fr"
-AddVoice        "it"    "MALE1"                "it"
-AddVoice        "pt"    "MALE1"                "pt"
-AddVoice        "ro"    "MALE1"                "ro"
-
-# Experimental voices
-AddVoice        "cs"    "MALE1"                "cs"
-AddVoice        "cy"    "MALE1"                "cy"
-AddVoice        "el"    "MALE1"                "el"
-AddVoice        "nl"    "MALE1"                "nl"
-AddVoice        "no"    "MALE1"                "no"
-AddVoice        "hi"    "MALE1"                "hi"
-AddVoice        "pl"    "MALE1"                "pl"
-AddVoice        "ru"    "MALE1"                "ru"
-AddVoice        "sv"    "MALE1"                "sv"
-AddVoice        "vi"    "MALE1"                "vi"
-
-
-# These parameters set _rate_, _pitch_, and _volume_ conversion. This is
-# part of the core of the definition of this generic output
-# module for this concrete synthesizer, it's not intended to
-# be modified by common users.
-# The resulting rate (or pitch) has the form:
-#       (speechd_rate * GenericRateMultiply) + GenericRateAdd
-# while speechd_rate is a value between -100 (lowest) and +100 (highest)
-# You have to define some meaningful conversion for each synthesizer
-
-# Here's the mapping from SSIP (Speech Dispatcher) to ESpeak (v1.10):
-#
-#           SSIP Range  SSIP Default    ESpeak Range    ESpeak Default
-#           ----------- ------------    ------------    --------------
-# Rate      -100 to 100     0           80 to 320       160
-# Pitch     -100 to 100     0            0 to 99         50
-# Volume    -100 to 100     0            0 to 20         10
-#
-# The SSIP defaults are actually controlled via DefaultRate, DefaultPitch, and
-# DefaultVolume in the speechd.conf file.
-
-GenericRateAdd          160
-GenericPitchAdd         50
-GenericVolumeAdd        10
-
-# (These values are multiplied by 100, because DotConf currently
-# doesn't support floats. So you can write 0.85 as 85 and so on.)
-
-GenericRateMultiply     160
-GenericPitchMultiply    50
-GenericVolumeMultiply   10
-
-# If the client program can't handle floats, you will have to
-# use these two options to force integers as the parameters
-# 1 means force integers, 0 means do nothing (write floats).
-
-GenericRateForceInteger     1
-GenericPitchForceInteger    1
-GenericVolumeForceInteger   1
-
-# Note that SSIP rates < -50 are spoken at -50.
-
-# Debug turns debugging on or off
-# See speechd.conf for information where debugging information is stored
-Debug 0
-
-
-# Copyright (C) 2006-2008 Brailcom, o.p.s
-# Copyright (C) 2006 Gary Cramblitt <garycramblitt@comcast.net>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
-# COPYING in the root directory).
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/ibmtts.conf b/speech-dispatcher/modules/ibmtts.conf

deleted file mode 100644 (file)

index 93f14ff..0000000
--- a/speech-dispatcher/modules/ibmtts.conf
+++ /dev/null
@@ -1,228 +0,0 @@
-
-# The number of samples returned by IBM TTS.
-#IbmttsAudioChunkSize 20000
-
-# -- SSML Support --
-
-# Some version of IBM TTS support SSML. If IbmttsUseSSML
-# is set to 1, SSML will be used and advanced features like
-# index marking will be working. If set to 0, all SSML is
-# deleted from the message prior to sending it to IBM TTS.
-# By default, SSML support is switched on.
-
-# IbmttsUseSSML 1
-
-# -- User dictionaries --
-
-# IBM TTS supports user dictionaries so that you may customize 
-# the pronunciation of words, beginning of words or abbreviations
-# according to the language. 
-# 
-# IbmttsDictionaryFolder defines the root directory under which you 
-# may add your dictionary files. If several languages are installed,
-# you may want to create one sub-directory per language. 
-#
-# Three examples : 
-# 
-# - a single language is installed:
-# place your files under IbmttsDictionaryFolder
-# 
-# - two languages are installed, say English and French:
-# place your files under IbmttsDictionaryFolder in sub-directories en and fr
-# 
-# - the same language for different regions are installed, say Castilian 
-#   Spanish and Mexican Spanish:
-#   place your files in directories es_ES and es_MX
-# 
-# The directory names are listed below (DIRECTORY NAMES and EXTENDED 
-# DIRECTORY NAMES).
-#
-# The name of the dictionary files are:
-#
-# - main.dct: main dictionary
-# - root.dct: roots dictionary
-# - extension.dct: main extension dictionary
-# - abbreviation.dct: abbreviation dictionary 
-#
-# The IBM TTS documentation details the syntax of the user dictionaries.
-# Basically, it is one line per entry, composed of key, tabulation, value. 
-#
-# DIRECTORY NAMES
-# ---------------
-# de: German
-# en: English
-# es: Spanish
-# fi: Finnish
-# fr: French
-# it: Italian
-# ja: Japanese
-# pt: Portuguese
-# zh: Chinese
-#
-# EXTENDED DIRECTORY NAMES
-# ------------------------
-# en_GB: British English
-# en_US: American English
-# fr_CA: Canadian French
-# fr_FR: French
-# pt_BR: Brazilian Portuguese
-# zh_CN: Mandarin Chinese
-# zh_TW: Mandarin Taiwanese
-
-IbmttsDictionaryFolder "/var/opt/IBM/ibmtts/dict"
-
-
-# -- Abbreviation dictionaries --
-
-# Enable the abbreviation dictionaries.
-#
-
-IbmttsUseAbbreviation 1
-
-# -- SOUND ICONS --
-
-# IBM TTS Synthesizer does not currently support sound icons
-# (audio files that are played by name when an application requests
-# a sound icon).  If you have installed the free(b)soft sound-icons
-# package, this is the directory where will they be found.  If not
-# blank, the IBM TTS Output Module will play them if it finds a
-# file whose name matches the sound icon name.  If blank, or no
-# matching file is found, the name of the sound icon will be spoken.
-
-#IbmttsSoundIconFolder "/usr/share/sounds/sound-icons/"
-
-# -- DEBUG --
-
-# Debug turns debugging on or off
-# See speechd.conf for information where debugging information is stored.
-
-# TODO: Change this to 0 and comment out for final release.
-
-Debug 0
-
-# DebugFile specifies the file where the debugging information
-# should be stored (note that the log is overwritten each time
-# the module starts)
-
-# DebugFile "/tmp/debug-ibmtts"
-
-# -- VOICE PARAMETERS --
-
-# This table provides a mechanism for fine-tuning the voices used for synthesis.
-# The dialect is chosen by the table above, then adjusted according to these parameters.
-# The columns are:
-#   Voice Name   - See the Speech Dispatcher manual for standard voice names.  Use lowercase names.
-#   M/F          - Gender.   0 = male. 1 = female.
-#   Br           - Breathiness.  0 to 100. 0 is usually used for males, 40 or 50 for females.
-#   Hd Sz        - Head Size.  0 to 100.
-#   Pitch Bas    - Pitch Baseline.  0 to 100.
-#   Pitch Flc    - Pitch Fluctuation.  0 to 100.
-#   Rough        - Roughness.  0 to 100
-#   Speed        - Rate.  0 to 100.
-
-# Volume is controlled via speechd.conf or SSIP commands.
-
-# Application RATE or PITCH commands are relative to the settings here.
-# For example, if Pitch Bas is 80 below, a PITCH command of -50 would set the
-# pitch baseline to halfway between 80 and 0, or 40.
-
-# All columns must be provided.
-
-#                                             Hd  -Pitch-
-#                      Voice Name     M/F Br  Sz  Bas Flc Rough Speed
-#                      -------------- --- --- --- --- --- ---   ---
-#IbmttsVoiceParameters "male1"          0   0  50  65  30   0    50
-#IbmttsVoiceParameters "male2"          0   0  86  56  47   0    50
-#IbmttsVoiceParameters "male3"          0   0  50  69  34   0    70
-#IbmttsVoiceParameters "male3"          0  20  30  61  44  18    50
-#IbmttsVoiceParameters "female1"        1  50  50  81  30   0    50
-#IbmttsVoiceParameters "female2"        1  40  56  89  35   0    70
-#IbmttsVoiceParameters "female3"        1  40  45  68  30   3    50
-IbmttsVoiceParameters  "child_male"     0   0  35  85  35   0    50
-#IbmttsVoiceParameters "child_female"   1   0  22  93  35   0    50
-
-# The table above shows the default mapping.
-# It shows the default settings in the IBM TTS Engine, as follows:
-#
-# SD Voice Name     IBM TTS Voice
-# -------------     -------------
-# male1             Adult Male 1
-# male2             Adult Male 2
-# male3             Adult Male 3
-# male3             Elderly Male (uncomment the 2nd "male3" line if you want to use this)
-# female1           Adult Female 1
-# female2           Adult Female 2
-# female3           Elderly Female (notice there is no Adult Female 3)
-# child_male        none provided (that is why it is uncommented, by default)
-# child_female      Child
-
-# -- KEY NAME SUBSTITUTIONS --
-
-# Maps Speech Dispatcher key names used in SSIP KEY commands to speakable words.
-# The string in the "SD Key" column occurring anywhere in a KEY command
-# is replaced with the string in "Spoken".  The substitutions occur in the
-# order listed.  "Lang" determines which language the substitution applies
-# to.
-
-#                     Lang  SD Key      Spoken
-#                     ----  ----------- -----------
-IbmttsKeySubstitution "en"  "kp--"      "keypad minus "
-IbmttsKeySubstitution "en"  "kp-"       "keypad "
-IbmttsKeySubstitution "en"  "_"         " "
-IbmttsKeySubstitution "en"  "#"         "pound "
-IbmttsKeySubstitution "en"  "&"         "ampersand "
-IbmttsKeySubstitution "en"  "!"         "exclamation mark "
-IbmttsKeySubstitution "en"  "¦"         "pipe "
-IbmttsKeySubstitution "en"  "¤"         "currency "
-IbmttsKeySubstitution "en"  "Ø"         "capital phi "
-IbmttsKeySubstitution "en"  "ø"         "phi "
-IbmttsKeySubstitution "en"  "ÿ"         "yummel "
-IbmttsKeySubstitution "en"  ""         "dash "
-IbmttsKeySubstitution "en"  "A"         "capital A "
-IbmttsKeySubstitution "en"  "B"         "capital B "
-IbmttsKeySubstitution "en"  "C"         "capital C "
-IbmttsKeySubstitution "en"  "D"         "capital D "
-IbmttsKeySubstitution "en"  "E"         "capital E "
-IbmttsKeySubstitution "en"  "F"         "capital F "
-IbmttsKeySubstitution "en"  "G"         "capital G "
-IbmttsKeySubstitution "en"  "H"         "capital H "
-IbmttsKeySubstitution "en"  "I"         "capital I "
-IbmttsKeySubstitution "en"  "J"         "capital J "
-IbmttsKeySubstitution "en"  "K"         "capital K "
-IbmttsKeySubstitution "en"  "L"         "capital L "
-IbmttsKeySubstitution "en"  "M"         "capital M "
-IbmttsKeySubstitution "en"  "N"         "capital N "
-IbmttsKeySubstitution "en"  "O"         "capital O "
-IbmttsKeySubstitution "en"  "P"         "capital P "
-IbmttsKeySubstitution "en"  "Q"         "capital Q "
-IbmttsKeySubstitution "en"  "R"         "capital R "
-IbmttsKeySubstitution "en"  "S"         "capital S "
-IbmttsKeySubstitution "en"  "T"         "capital T "
-IbmttsKeySubstitution "en"  "U"         "capital U "
-IbmttsKeySubstitution "en"  "V"         "capital V "
-IbmttsKeySubstitution "en"  "W"         "capital W "
-IbmttsKeySubstitution "en"  "X"         "capital X "
-IbmttsKeySubstitution "en"  "Y"         "capital Y "
-IbmttsKeySubstitution "en"  "Z"         "capital Z "
-
-
-
-# Copyright (C) 2006 Gary Cramblitt <garycramblitt@comcast.net>
-# Copyright (C) 2007-2008 Brailcom, o.p.s
-# Copyright (C) 2007 Lukas Loehrer <listaddr1@gmx.net>
-# Copyright (C) 2007-2013 Gilles Casse <gcasse@oralux.org>
-# Copyright (C) 2010 Christopher Brannon <cmbrannon79@gmail.com>
-# Copyright (C) 2016 Luke Yelavich <themuso@themuso.com>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
-# COPYING in the root directory).
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/ivona.conf b/speech-dispatcher/modules/ivona.conf

deleted file mode 100644 (file)

index 261820e..0000000
--- a/speech-dispatcher/modules/ivona.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-# Host and port - default values 
-#IvonaServerHost "127.0.0.1"
-#IvonaServerPort 9123
-
-#Sample Frequency
-#IvonaSampleFreq 16000
-
-# Debug level - see Festival module configuration
-Debug 0
-
-
-# DebugFile specifies the file where the debugging information
-# should be stored (note that the log is overwritten each time
-# the module starts)
-# DebugFile "/tmp/debug-ivona"
-
-# IvonaMinCapLet overrides DefaultCapLetRecognition.  Set to:
-# 1 for "icon" - play icon even if default is "none"
-# 2 for "spell" - spell "capital" even if default is "none" or "icon"
-
-IvonaMinCapLet 1
-
-IvonaSoundIconPath "/usr/share/sounds/sound-icons-0.1/"
-
-#Ivona Speaker (depends on Ivona version)
-#Jacek or Ewa for pl, Jennifer for en, Carmen for ro
-
-IvonaSpeakerName "Jacek"
-IvonaSpeakerLanguage "pl"
-
-#Delimiters for message splitting
-#Do not change if not sure!
-#IvonaDelimiters ".;:,!?"
-
-#Punctuation for "some"
-#IvonaPunctuationSome "()"
-
-
-
-# Copyright (C) 2008 Brailcom, o.p.s
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
-# COPYING in the root directory).
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/kali.conf b/speech-dispatcher/modules/kali.conf

deleted file mode 100644 (file)

index d047a07..0000000
--- a/speech-dispatcher/modules/kali.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# -- Kali parameters --
-
-KaliMaxChunkLength    4999
-KaliDelimiters        ".?!;"
-
-# -- Voices --
-
-# 3 french voices, 2 english voices
-KaliVoiceParameters "Patrick" # French male 1
-#KaliVoiceParameters "Michel" # French male 2
-#KaliVoiceParameters "Guillemette" # French female 1
-#KaliVoiceParameters "Tom" # English male 1
-#KaliVoiceParameters "Rosalind" # English female 2
-
-# -- Rate control --
-# Normal rate (0 in speech-dispatcher)
-KaliNormalRate 5
-
-# -- Volume control --
-# Normal volume (0 in speech-dispatcher)
-KaliNormalVolume 10
-
-# -- Pitch control --
-# Normal pitch (0 in speech-dispatcher)
-KaliNormalPitch 6
-
-
-# Copyright (C) 2018 Raphaël POITEVIN <rpoitevin@hypra.fr>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
-# COPYING in the root directory).
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/pico-generic.conf b/speech-dispatcher/modules/pico-generic.conf

deleted file mode 100644 (file)

index ba1bff3..0000000
--- a/speech-dispatcher/modules/pico-generic.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-# pico output module is based on the generic plugin for Speech
-# Dispatcher. It means there is no code written explicitly for
-# this plugin, all the specifics are handled in this configuration
-# and we call a simple command line client to perform the actual
-# synthesis. Use this config file with the sd_generic output module.
-#
-# IMPORTANT: The audio output method relies on an audio playback
-# utility (play, aplay, paplay for OSS, ALSA or Pulse)
-# being installed. If this is not the case, consider installing it
-# or replace the $PLAY_COMMAND string in the GenericExecuteString below
-# with play, paplay or similar.
-#
-# GenericExecuteSynth is the shell command that should be
-# executed in order to say some message. This command must
-# stop saying the message on SIGKILL, otherwise it's useless.
-# You can use the variables $LANGUAGE, $VOICE, $PITCH and $RATE
-# which will be substituted for the appropriate value (you
-# can modify this value, see other parameters).
-# The command can be split into more lines, if necessary, using '\'.
-GenericExecuteSynth \
-"pico2wave -w $TMPDIR/pico.wav -l $VOICE \'$DATA\' && $PLAY_COMMAND $TMPDIR/pico.wav"
-
-GenericCmdDependency "pico2wave"
-
-# The following three items control punctuation levels None, Some, and All.
-# Each of these values will be substituted into the $PUNCT variable depending
-# on the value passed to speech dispatcher from applications.
-# Note that if an empty string is specified, then $PUNCT will be blank 
-# which is a default situation for espeak.
- 
-GenericPunctNone ""
-GenericPunctSome "--punct=\"()[]{};:\""
-GenericPunctAll "--punct"
-
-# GenericStripPunctChars is a list (enclosed in doublequotes) of
-# all the characters that should be replaced by whitespaces in
-# order not to be badly handled by the output module or misinterpreted
-# by shell.
-# GenericStripPunctChars  ""
-
-# If the language you need to pass in $LANG is different
-# from the standard ISO language code, you can specify
-# which string to use instead. If you wish to use
-# other than ISO charset for the specified language,
-# you can add it's name (as accepted by iconv) as a
-# third parameter in doublequotes.
-
-
-GenericLanguage                  "en" "en" "utf-8"
-GenericLanguage                  "de" "de" "utf-8"
-GenericLanguage                  "es" "es" "utf-8"
-GenericLanguage                  "fr" "fr" "utf-8"
-GenericLanguage                  "it" "it" "utf-8"
-
-# AddVoice specifies which $VOICE string should be assigned to
-# each language and symbolic voice name. All the voices you want
-# to use must be specified here. This list will likely not be
-# up-to-date, please check pico documentation and add the voices
-# you want to use.
-
-AddVoice        "en"    "FEMALE1"      "en-US"
-AddVoice        "en"    "FEMALE2"      "en-GB"
-AddVoice        "de"    "FEMALE1"      "de-DE"
-AddVoice        "es"    "FEMALE1"      "es-ES"
-AddVoice        "fr"    "FEMALE1"      "fr-FR"
-AddVoice        "it"    "FEMALE1"      "it-IT"
-
-# Yes, it's wrong, but this way you at least get something even when configured
-# (by default) to use a male voice
-AddVoice        "en"    "MALE1"                "en-US"
-AddVoice        "en"    "MALE2"                "en-GB"
-AddVoice        "de"    "MALE1"                "de-DE"
-AddVoice        "es"    "MALE1"                "es-ES"
-AddVoice        "fr"    "MALE1"                "fr-FR"
-AddVoice        "it"    "MALE1"                "it-IT"
-
-# Debug turns debugging on or off
-# See speechd.conf for information where debugging information is stored
-Debug 0
-
-
-# Copyright (C) 2014-2018 Samuel Thibault <samuel.thibault@ens-lyon.org>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
-# COPYING in the root directory).
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/ssl/openssl.cnf b/ssl/openssl.cnf

index 4acca4b0446f536598cc1b127b0975294c928c58..d8b12a896dbcd7a9f98096ecd16ecc9199469355 100644 (file)
--- a/ssl/openssl.cnf
+++ b/ssl/openssl.cnf
@@ -1,7 +1,9 @@
  #
  # OpenSSL example configuration file.
-# This is mostly being used for generation of certificate requests.
+# See doc/man5/config.pod for more info.
  #
+# This is mostly being used for generation of certificate requests,
+# but may be used for auto loading of providers
  
  # Note that you can include other files from the main configuration
  # file using the .include directive.
@@ -11,9 +13,15 @@
  # defined.
  HOME                   = .
  
+ # Use this in order to automatically load providers.
+openssl_conf = openssl_init
+
+# Comment out the next line to ignore configuration errors
+config_diagnostics = 1
+
  # Extra OBJECT IDENTIFIER info:
-#oid_file              = $ENV::HOME/.oid
-oid_section            = new_oids
+# oid_file       = $ENV::HOME/.oid
+oid_section = new_oids
  
  # To use this configuration file with the "-extfile" option of the
  # "openssl x509" utility, name here the section containing the
@@ -23,7 +31,6 @@ oid_section           = new_oids
  # X.509v3 extensions in its main [= default] section.)
  
  [ new_oids ]
-
  # We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
  # Add a simple OID like this:
  # testoid1=1.2.3.4
@@ -35,6 +42,37 @@ tsa_policy1 = 1.2.3.4.1
  tsa_policy2 = 1.2.3.4.5.6
  tsa_policy3 = 1.2.3.4.5.7
  
+# For FIPS
+# Optionally include a file that is generated by the OpenSSL fipsinstall
+# application. This file contains configuration data required by the OpenSSL
+# fips provider. It contains a named section e.g. [fips_sect] which is
+# referenced from the [provider_sect] below.
+# Refer to the OpenSSL security policy for more information.
+# .include fipsmodule.cnf
+
+[openssl_init]
+providers = provider_sect
+ssl_conf = ssl_sect
+
+# List of providers to load
+[provider_sect]
+default = default_sect
+# The fips section name should match the section name inside the
+# included fipsmodule.cnf.
+# fips = fips_sect
+
+# If no providers are activated explicitly, the default one is activated implicitly.
+# See man 7 OSSL_PROVIDER-default for more details.
+#
+# If you add a section explicitly activating any other provider(s), you most
+# probably need to explicitly activate the default provider, otherwise it
+# becomes unavailable in openssl.  As a consequence applications depending on
+# OpenSSL may not work correctly which could lead to significant system
+# problems including inability to remotely access the system.
+[default_sect]
+# activate = 1
+
+
  ####################################################################
  [ ca ]
  default_ca     = CA_default            # The default ca section
@@ -171,27 +209,9 @@ unstructuredName           = An optional company name
  
  basicConstraints=CA:FALSE
  
-# Here are some examples of the usage of nsCertType. If it is omitted
-# the certificate can be used for anything *except* object signing.
-
-# This is OK for an SSL server.
-# nsCertType                   = server
-
-# For an object signing certificate this would be used.
-# nsCertType = objsign
-
-# For normal client use this is typical
-# nsCertType = client, email
-
-# and for everything including object signing:
-# nsCertType = client, email, objsign
-
  # This is typical in keyUsage for a client certificate.
  # keyUsage = nonRepudiation, digitalSignature, keyEncipherment
  
-# This will be displayed in Netscape's comment listbox.
-nsComment                      = "OpenSSL Generated Certificate"
-
  # PKIX recommendations harmless if included in all certificates.
  subjectKeyIdentifier=hash
  authorityKeyIdentifier=keyid,issuer
@@ -206,13 +226,6 @@ authorityKeyIdentifier=keyid,issuer
  # Copy subject details
  # issuerAltName=issuer:copy
  
-#nsCaRevocationUrl             = http://www.domain.dom/ca-crl.pem
-#nsBaseUrl
-#nsRevocationUrl
-#nsRenewalUrl
-#nsCaPolicyUrl
-#nsSslServerName
-
  # This is required for TSA certificates.
  # extendedKeyUsage = critical,timeStamping
  
@@ -242,9 +255,6 @@ basicConstraints = critical,CA:true
  # left out by default.
  # keyUsage = cRLSign, keyCertSign
  
-# Some might want this also
-# nsCertType = sslCA, emailCA
-
  # Include email address in subject alt name: another PKIX recommendation
  # subjectAltName=email:copy
  # Copy issuer details
@@ -272,27 +282,9 @@ authorityKeyIdentifier=keyid:always
  
  basicConstraints=CA:FALSE
  
-# Here are some examples of the usage of nsCertType. If it is omitted
-# the certificate can be used for anything *except* object signing.
-
-# This is OK for an SSL server.
-# nsCertType                   = server
-
-# For an object signing certificate this would be used.
-# nsCertType = objsign
-
-# For normal client use this is typical
-# nsCertType = client, email
-
-# and for everything including object signing:
-# nsCertType = client, email, objsign
-
  # This is typical in keyUsage for a client certificate.
  # keyUsage = nonRepudiation, digitalSignature, keyEncipherment
  
-# This will be displayed in Netscape's comment listbox.
-nsComment                      = "OpenSSL Generated Certificate"
-
  # PKIX recommendations harmless if included in all certificates.
  subjectKeyIdentifier=hash
  authorityKeyIdentifier=keyid,issuer
@@ -307,13 +299,6 @@ authorityKeyIdentifier=keyid,issuer
  # Copy subject details
  # issuerAltName=issuer:copy
  
-#nsCaRevocationUrl             = http://www.domain.dom/ca-crl.pem
-#nsBaseUrl
-#nsRevocationUrl
-#nsRenewalUrl
-#nsCaPolicyUrl
-#nsSslServerName
-
  # This really needs to be in place for it to be a proxy certificate.
  proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
  
@@ -348,3 +333,65 @@ ess_cert_id_chain  = no    # Must the ESS cert id chain be included?
                                 # (optional, default: no)
  ess_cert_id_alg                = sha1  # algorithm to compute certificate
                                 # identifier (optional, default: sha1)
+
+[insta] # CMP using Insta Demo CA
+# Message transfer
+server = pki.certificate.fi:8700
+# proxy = # set this as far as needed, e.g., http://192.168.1.1:8080
+# tls_use = 0
+path = pkix/
+
+# Server authentication
+recipient = "/C=FI/O=Insta Demo/CN=Insta Demo CA" # or set srvcert or issuer
+ignore_keyusage = 1 # potentially needed quirk
+unprotected_errors = 1 # potentially needed quirk
+extracertsout = insta.extracerts.pem
+
+# Client authentication
+ref = 3078 # user identification
+secret = pass:insta # can be used for both client and server side
+
+# Generic message options
+cmd = ir # default operation, can be overridden on cmd line with, e.g., kur
+
+# Certificate enrollment
+subject = "/CN=openssl-cmp-test"
+newkey = insta.priv.pem
+out_trusted = insta.ca.crt
+certout = insta.cert.pem
+
+[pbm] # Password-based protection for Insta CA
+# Server and client authentication
+ref = $insta::ref # 3078
+secret = $insta::secret # pass:insta
+
+[signature] # Signature-based protection for Insta CA
+# Server authentication
+trusted = insta.ca.crt # does not include keyUsage digitalSignature
+
+# Client authentication
+secret = # disable PBM
+key = $insta::newkey # insta.priv.pem
+cert = $insta::certout # insta.cert.pem
+
+[ir]
+cmd = ir
+
+[cr]
+cmd = cr
+
+[kur]
+# Certificate update
+cmd = kur
+oldcert = $insta::certout # insta.cert.pem
+
+[rr]
+# Certificate revocation
+cmd = rr
+oldcert = $insta::certout # insta.cert.pem
+
+[ssl_sect]
+system_default = system_default_sect
+
+[system_default_sect]
+CipherString = DEFAULT:@SECLEVEL=2
diff --git a/sysctl.conf b/sysctl.conf

index c5110c51166e15003a9fc7f6bc07fc8c6fcfcef2..0428e30c2359d5b97b8dab5bcf052d2a0db94a2e 100644 (file)
--- a/sysctl.conf
+++ b/sysctl.conf
@@ -9,7 +9,7 @@
  # Uncomment the following to stop low-level messages on console
  #kernel.printk = 3 4 1 3
  
-##############################################################3
+###################################################################
  # Functions previously found in netbase
  #
  
diff --git a/sysctl.d/10-kernel-hardening.conf b/sysctl.d/10-kernel-hardening.conf

index deffa15a5c5aeb8fcd6274d63688b8109c21567b..91bc8c8424fd14892e491d5053acc3b027129bb0 100644 (file)
--- a/sysctl.d/10-kernel-hardening.conf
+++ b/sysctl.d/10-kernel-hardening.conf
@@ -13,3 +13,13 @@
  # of "0" allows all users to see the kernel addresses. A value of "1"
  # limits visibility to the root user, and "2" blocks even the root user.
  kernel.kptr_restrict = 1
+
+# Access to the kernel log buffer can be especially useful for an attacker
+# attempting to exploit the local kernel, as kernel addresses and detailed
+# call traces are frequently found in kernel oops messages. Setting
+# dmesg_restrict to "0" allows all users to view the kernel log buffer,
+# and setting it to "1" restricts access to those with CAP_SYSLOG.
+#
+# dmesg_restrict defaults to 1 via CONFIG_SECURITY_DMESG_RESTRICT, only
+# uncomment the following line to disable.
+# kernel.dmesg_restrict = 0
diff --git a/sysctl.d/README.sysctl b/sysctl.d/README.sysctl

index c0e3d6d22d6ff0ab6f03f09b6e1b4a3bcba56cdb..2409081870ca3febd45f794a20832f839d3dc053 100644 (file)
--- a/sysctl.d/README.sysctl
+++ b/sysctl.d/README.sysctl
@@ -12,5 +12,5 @@ My personal preference would be for local system settings to go into
  of the file, anything will work. See sysctl.conf(8) man page for details
  of the format.
  
-After making any changes, please run "service procps reload" (or, from
+After making any changes, please run "service procps force-reload" (or, from
  a Debian package maintainer script "deb-systemd-invoke restart procps.service").
diff --git a/systemd/journald.conf b/systemd/journald.conf

index 8951d9e60a7d907658acbc42bc5cdd2d31051f21..a690681dd09df4c80fb0bafcafd9664068c73a2a 100644 (file)
--- a/systemd/journald.conf
+++ b/systemd/journald.conf
@@ -1,13 +1,16 @@
  #  This file is part of systemd.
  #
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
+#  systemd is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
+#  any later version.
  #
-# Entries in this file show the compile time defaults.
-# You can change settings by editing this file.
-# Defaults can be restored by simply deleting this file.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the journald.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
+#
+# Use 'systemd-analyze cat-config systemd/journald.conf' to display the full config.
  #
  # See journald.conf(5) for details.
  
@@ -41,3 +44,4 @@
  #MaxLevelWall=emerg
  #LineMax=48K
  #ReadKMsg=yes
+#Audit=no
diff --git a/systemd/logind.conf b/systemd/logind.conf

index d380a616e3eb6b80a7043076a3ebef2fd81d1a6e..ab600bc7d8f79a52ef68178ca6b575557726cac8 100644 (file)
--- a/systemd/logind.conf
+++ b/systemd/logind.conf
@@ -1,13 +1,16 @@
  #  This file is part of systemd.
  #
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
+#  systemd is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
+#  any later version.
  #
-# Entries in this file show the compile time defaults.
-# You can change settings by editing this file.
-# Defaults can be restored by simply deleting this file.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the logind.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
+#
+# Use 'systemd-analyze cat-config systemd/logind.conf' to display the full config.
  #
  # See logind.conf(5) for details.
  
@@ -18,20 +21,24 @@
  #KillOnlyUsers=
  #KillExcludeUsers=root
  #InhibitDelayMaxSec=5
+#UserStopDelaySec=10
  #HandlePowerKey=poweroff
  #HandleSuspendKey=suspend
  #HandleHibernateKey=hibernate
  #HandleLidSwitch=suspend
  #HandleLidSwitchExternalPower=suspend
  #HandleLidSwitchDocked=ignore
+#HandleRebootKey=reboot
  #PowerKeyIgnoreInhibited=no
  #SuspendKeyIgnoreInhibited=no
  #HibernateKeyIgnoreInhibited=no
  #LidSwitchIgnoreInhibited=yes
+#RebootKeyIgnoreInhibited=no
  #HoldoffTimeoutSec=30s
  #IdleAction=ignore
  #IdleActionSec=30min
  #RuntimeDirectorySize=10%
+#RuntimeDirectoryInodesMax=400k
  #RemoveIPC=yes
  #InhibitorsMax=8192
  #SessionsMax=8192
diff --git a/systemd/networkd.conf b/systemd/networkd.conf

index c5667da9fadb0dfdee7a59aac2ebb24744862fc5..38dc9f1f79d9396386f9862358ac6c1d51e72ae4 100644 (file)
--- a/systemd/networkd.conf
+++ b/systemd/networkd.conf
@@ -1,20 +1,28 @@
  #  This file is part of systemd.
  #
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
+#  systemd is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
+#  any later version.
  #
-# Entries in this file show the compile time defaults.
-# You can change settings by editing this file.
-# Defaults can be restored by simply deleting this file.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the networkd.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
  #
-# See networkd.conf(5) for details
+# See networkd.conf(5) for details.
  
  [Network]
  #SpeedMeter=no
  #SpeedMeterIntervalSec=10sec
+#ManageForeignRoutingPolicyRules=yes
+#ManageForeignRoutes=yes
+#RouteTable=
  
-[DHCP]
+[DHCPv4]
+#DUIDType=vendor
+#DUIDRawData=
+
+[DHCPv6]
  #DUIDType=vendor
  #DUIDRawData=
diff --git a/systemd/pstore.conf b/systemd/pstore.conf

index 93a8b6707cc2d8d3aa062c7e45a94d2c645fd454..68fb04ae0a0c696081c57465dc317207a12e6028 100644 (file)
--- a/systemd/pstore.conf
+++ b/systemd/pstore.conf
@@ -1,13 +1,14 @@
  #  This file is part of systemd.
  #
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
+#  systemd is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
+#  any later version.
  #
-# Entries in this file show the compile time defaults.
-# You can change settings by editing this file.
-# Defaults can be restored by simply deleting this file.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the pstore.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
  #
  # See pstore.conf(5) for details.
  
diff --git a/systemd/resolved.conf b/systemd/resolved.conf

index 85b70d2291dd4ae8e2e398a503ae973b07d94bbf..9f70947d134b097aea368493312616fa07637ba3 100644 (file)
--- a/systemd/resolved.conf
+++ b/systemd/resolved.conf
@@ -1,24 +1,34 @@
  #  This file is part of systemd.
  #
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
+#  systemd is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
+#  any later version.
  #
-# Entries in this file show the compile time defaults.
-# You can change settings by editing this file.
-# Defaults can be restored by simply deleting this file.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the resolved.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
  #
-# See resolved.conf(5) for details
+# Use 'systemd-analyze cat-config systemd/resolved.conf' to display the full config.
+#
+# See resolved.conf(5) for details.
  
  [Resolve]
+# Some examples of DNS servers which may be used for DNS= and FallbackDNS=:
+# Cloudflare: 1.1.1.1#cloudflare-dns.com 1.0.0.1#cloudflare-dns.com 2606:4700:4700::1111#cloudflare-dns.com 2606:4700:4700::1001#cloudflare-dns.com
+# Google:     8.8.8.8#dns.google 8.8.4.4#dns.google 2001:4860:4860::8888#dns.google 2001:4860:4860::8844#dns.google
+# Quad9:      9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
  #DNS=
  #FallbackDNS=
  #Domains=
-#LLMNR=no
-#MulticastDNS=no
  #DNSSEC=no
  #DNSOverTLS=no
+#MulticastDNS=no
+#LLMNR=no
  #Cache=no-negative
+#CacheFromLocalhost=no
  #DNSStubListener=yes
+#DNSStubListenerExtra=
  #ReadEtcHosts=yes
+#ResolveUnicastSingleLabel=no
diff --git a/systemd/sleep.conf b/systemd/sleep.conf

index dc2ed37f70805adaf2dfbfc4b926aabfd4a28409..174f5ea3e8b0b01c8d013aa4f508fd895c0c4a45 100644 (file)
--- a/systemd/sleep.conf
+++ b/systemd/sleep.conf
@@ -1,15 +1,16 @@
  #  This file is part of systemd.
  #
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
+#  systemd is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
+#  any later version.
  #
-# Entries in this file show the compile time defaults.
-# You can change settings by editing this file.
-# Defaults can be restored by simply deleting this file.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the sleep.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
  #
-# See systemd-sleep.conf(5) for details
+# See systemd-sleep.conf(5) for details.
  
  [Sleep]
  #AllowSuspend=yes
diff --git a/systemd/system.conf b/systemd/system.conf

index 411777852c6c5e01531740ef51981b7bd7e9da59..1e3f9417d84361166483d0e5c85ef6c5925d25b7 100644 (file)
--- a/systemd/system.conf
+++ b/systemd/system.conf
@@ -1,13 +1,16 @@
  #  This file is part of systemd.
  #
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
+#  systemd is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
+#  any later version.
  #
-# Entries in this file show the compile time defaults.
-# You can change settings by editing this file.
-# Defaults can be restored by simply deleting this file.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the system.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
+#
+# Use 'systemd-analyze cat-config systemd/system.conf' to display the full config.
  #
  # See systemd-system.conf(5) for details.
  
@@ -16,18 +19,18 @@
  #LogTarget=journal-or-kmsg
  #LogColor=yes
  #LogLocation=no
+#LogTime=no
  #DumpCore=yes
  #ShowStatus=yes
  #CrashChangeVT=no
  #CrashShell=no
  #CrashReboot=no
  #CtrlAltDelBurstAction=reboot-force
-#CPUAffinity=1 2
+#CPUAffinity=
  #NUMAPolicy=default
  #NUMAMask=
  #RuntimeWatchdogSec=0
  #RebootWatchdogSec=10min
-#ShutdownWatchdogSec=10min
  #KExecWatchdogSec=0
  #WatchdogDevice=
  #CapabilityBoundingSet=
@@ -51,7 +54,7 @@
  #DefaultBlockIOAccounting=no
  #DefaultMemoryAccounting=yes
  #DefaultTasksAccounting=yes
-#DefaultTasksMax=
+#DefaultTasksMax=15%
  #DefaultLimitCPU=
  #DefaultLimitFSIZE=
  #DefaultLimitDATA=
@@ -68,3 +71,4 @@
  #DefaultLimitNICE=
  #DefaultLimitRTPRIO=
  #DefaultLimitRTTIME=
+#DefaultOOMPolicy=stop
diff --git a/systemd/system/multi-user.target.wants/ondemand.service b/systemd/system/multi-user.target.wants/ondemand.service

deleted file mode 120000 (symlink)

index 596ee4b..0000000
--- a/systemd/system/multi-user.target.wants/ondemand.service
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/ondemand.service
-\ No newline at end of file
diff --git a/systemd/system/timers.target.wants/dpkg-db-backup.timer b/systemd/system/timers.target.wants/dpkg-db-backup.timer

new file mode 120000 (symlink)

index 0000000..12072e6
--- /dev/null
+++ b/systemd/system/timers.target.wants/dpkg-db-backup.timer
@@ -0,0 +1 @@
+/lib/systemd/system/dpkg-db-backup.timer
+\ No newline at end of file
diff --git a/systemd/user.conf b/systemd/user.conf

index bb10619481010c353cf1fd496f454455003c004c..97bc68b6f8effdb5b7ff0e0174d58ca2ab9489a8 100644 (file)
--- a/systemd/user.conf
+++ b/systemd/user.conf
@@ -1,20 +1,23 @@
  #  This file is part of systemd.
  #
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
+#  systemd is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
+#  any later version.
  #
-# You can override the directives in this file by creating files in
-# /etc/systemd/user.conf.d/*.conf.
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the user.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
  #
-# See systemd-user.conf(5) for details
+# See systemd-user.conf(5) for details.
  
  [Manager]
  #LogLevel=info
  #LogTarget=console
  #LogColor=yes
  #LogLocation=no
+#LogTime=no
  #SystemCallArchitectures=
  #TimerSlackNSec=
  #StatusUnitFormat=description
diff --git a/systemd/user/graphical-session-pre.target.wants/session-migration.service b/systemd/user/graphical-session-pre.target.wants/session-migration.service

new file mode 120000 (symlink)

index 0000000..341dc1d
--- /dev/null
+++ b/systemd/user/graphical-session-pre.target.wants/session-migration.service
@@ -0,0 +1 @@
+/usr/lib/systemd/user/session-migration.service
+\ No newline at end of file
diff --git a/xattr.conf b/xattr.conf

index dcbc12c251fcc8b38850e44217e38426ac9763d6..1affac56a592dd1ab36e0770a2754bd0469c4cdf 100644 (file)
--- a/xattr.conf
+++ b/xattr.conf
@@ -19,3 +19,4 @@ trusted.SGI_MAC_FILE          skip            # xfs specific
  xfsroot.*                      skip            # xfs specific; obsolete
  user.Beagle.*                  skip            # ignore Beagle index data
  security.evm                   skip            # may only be written by kernel
+afs.*                          skip            # AFS metadata and ACLs
diff --git a/xdg/autostart/nautilus-autostart.desktop b/xdg/autostart/nautilus-autostart.desktop

deleted file mode 100644 (file)

index 2be8f93..0000000
--- a/xdg/autostart/nautilus-autostart.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Files
-Exec=nautilus-desktop
-OnlyShowIn=GNOME;Unity;
-AutostartCondition=GSettings org.gnome.desktop.background show-desktop-icons
-NoDisplay=true
-X-Ubuntu-Gettext-Domain=nautilus
diff --git a/xdg/autostart/tracker-extract.desktop b/xdg/autostart/tracker-extract.desktop

deleted file mode 100644 (file)

index c08f54a..0000000
--- a/xdg/autostart/tracker-extract.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Name=Tracker Metadata Extractor
-Comment=Extracts metadata from local files
-Icon=
-Exec=/usr/libexec/tracker-extract
-Terminal=false
-Type=Application
-Categories=Utility;
-X-GNOME-Autostart-enabled=true
-X-GNOME-HiddenUnderSystemd=true
-X-KDE-autostart-after=panel
-X-KDE-StartupNotify=false
-X-KDE-UniqueApplet=true
-NoDisplay=true
-OnlyShowIn=GNOME;KDE;XFCE;X-IVI;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=tracker
-X-GNOME-Bugzilla-Component=Extractor
-X-GNOME-Bugzilla-Version=2.3.3
-X-Ubuntu-Gettext-Domain=tracker-miners
diff --git a/xdg/autostart/tracker-miner-fs.desktop b/xdg/autostart/tracker-miner-fs.desktop

deleted file mode 100644 (file)

index 2c7d9ed..0000000
--- a/xdg/autostart/tracker-miner-fs.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Name=Tracker File System Miner
-Comment=Crawls and processes files on the file system
-Icon=
-Exec=/usr/libexec/tracker-miner-fs
-Terminal=false
-Type=Application
-Categories=Utility;
-X-GNOME-Autostart-enabled=true
-X-GNOME-HiddenUnderSystemd=true
-X-KDE-autostart-after=panel
-X-KDE-StartupNotify=false
-X-KDE-UniqueApplet=true
-NoDisplay=true
-OnlyShowIn=GNOME;KDE;XFCE;X-IVI;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=tracker
-X-GNOME-Bugzilla-Component=Miners
-X-GNOME-Bugzilla-Version=2.3.3
-X-Ubuntu-Gettext-Domain=tracker-miners
diff --git a/xdg/autostart/tracker-store.desktop b/xdg/autostart/tracker-store.desktop

deleted file mode 100644 (file)

index 7718431..0000000
--- a/xdg/autostart/tracker-store.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Tracker Store
-Comment=Metadata database store and lookup manager
-Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
-Terminal=false
-Type=Application
-Categories=Utility;
-X-GNOME-Autostart-enabled=true
-X-KDE-autostart-after=panel
-X-KDE-StartupNotify=false
-X-KDE-UniqueApplet=true
-NoDisplay=true
-X-Ubuntu-Gettext-Domain=tracker
diff --git a/xdg/katomic.knsrc b/xdg/katomic.knsrc

deleted file mode 100644 (file)

index 9bf8281..0000000
--- a/xdg/katomic.knsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[KNewStuff3]
-ProvidersUrl=http://download.kde.org/ocs/providers.xml
-Categories=KAtomic Level
-Uncompress=archive
-TargetDir=katomic/levels
diff --git a/xdg/kblocks.knsrc b/xdg/kblocks.knsrc

deleted file mode 100644 (file)

index f411c92..0000000
--- a/xdg/kblocks.knsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[KNewStuff3]
-ProvidersUrl=http://download.kde.org/ocs/providers.xml
-Categories=KBlocks Themes
-TargetDir=kblocks/themes
-Uncompress=always
diff --git a/xdg/kcardtheme.knsrc b/xdg/kcardtheme.knsrc

deleted file mode 100644 (file)

index 7e80f38..0000000
--- a/xdg/kcardtheme.knsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[KNewStuff3]
-ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
-Categories=KDE Card Deck
-TargetDir=carddecks
-Uncompress=archive
diff --git a/xdg/kdiamond.knsrc b/xdg/kdiamond.knsrc

deleted file mode 100644 (file)

index 50a3a28..0000000
--- a/xdg/kdiamond.knsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[KNewStuff3]
-ProvidersUrl=http://download.kde.org/ocs/providers.xml
-Categories=KDiamonds Themes
-TargetDir=kdiamond/themes/
-Uncompress=always
diff --git a/xdg/kgoldrunner.knsrc b/xdg/kgoldrunner.knsrc

deleted file mode 100644 (file)

index c8ed9cf..0000000
--- a/xdg/kgoldrunner.knsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[KNewStuff3]
-ProvidersUrl=http://download.kde.org/ocs/providers.xml
-Categories=KGoldrunner Themes
-TargetDir=kgoldrunner/themes
-Uncompress=always
diff --git a/xdg/kigo-games.knsrc b/xdg/kigo-games.knsrc

deleted file mode 100644 (file)

index 98a4f72..0000000
--- a/xdg/kigo-games.knsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[KNewStuff3]
-ProvidersUrl=http://download.kde.org/ocs/providers.xml
-Categories=Kigo Games
-TargetDir=kigo/games
-Uncompress=archive
diff --git a/xdg/kigo.knsrc b/xdg/kigo.knsrc

deleted file mode 100644 (file)

index 47c3001..0000000
--- a/xdg/kigo.knsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[KNewStuff3]
-ProvidersUrl=http://download.kde.org/ocs/providers.xml
-Categories=Kigo Themes
-TargetDir=kigo/themes
-Uncompress=never
diff --git a/xdg/kpat.knsrc b/xdg/kpat.knsrc

deleted file mode 100644 (file)

index a1b92a4..0000000
--- a/xdg/kpat.knsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[KNewStuff3]
-ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
-Categories=KDE KPat Theme
-TargetDir=kpat/themes
-Uncompress=archive
diff --git a/xdg/ksirk.knsrc b/xdg/ksirk.knsrc

deleted file mode 100644 (file)

index 34b2196..0000000
--- a/xdg/ksirk.knsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[KNewStuff3]
-ProvidersUrl=http://download.kde.org/ocs/providers.xml
-Categories=KSirk Themes
-TargetDir=ksirk/skins
-Uncompress=always
diff --git a/xdg/ksnakeduel.knsrc b/xdg/ksnakeduel.knsrc

deleted file mode 100644 (file)

index a9a5197..0000000
--- a/xdg/ksnakeduel.knsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[KNewStuff3]
-ProvidersUrl=http://download.kde.org/ocs/providers.xml
-Categories=KSnakeDuel Themes
-TargetDir=ksnakeduel/themes/
-Uncompress=always
diff --git a/xml/catalog b/xml/catalog

index ec1abf49bd0bf8b730a07765dbbb8d4171545ae3..3b5e17951b530a970fff4d7d3309ddfa1424510a 100644 (file)
--- a/xml/catalog
+++ b/xml/catalog
@@ -2,33 +2,9 @@
  <!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
    "file:///usr/share/xml/schema/xml-core/catalog.dtd">
  <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-<delegatePublic publicIdStartString="+//IDN faq.org//DTD Frequently Asked Questions" catalog="file:///etc/xml/sgml-data.xml"/>
-<delegatePublic publicIdStartString="+//ISBN 82-7640-023//DTD Frequently Asked Questions//EN" catalog="file:///etc/xml/sgml-data.xml"/>
-<delegatePublic publicIdStartString="-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" catalog="file:///etc/xml/xml-core.xml"/>
-<delegatePublic publicIdStartString="-//Normal Walsh//Exchange Table Model 19960430" catalog="file:///etc/xml/docbook-xml.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//DTD CALS Table Model XML" catalog="file:///etc/xml/docbook-xml.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBk XML" catalog="file:///etc/xml/docbook-xml.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBook XML" catalog="file:///etc/xml/docbook-xml.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//ELEMENTS DocBk XML" catalog="file:///etc/xml/docbook-xml.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBk XML" catalog="file:///etc/xml/docbook-xml.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model" catalog="file:///etc/xml/docbook-xml.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="file:///etc/xml/docbook-xml.xml"/>
+<delegateSystem systemIdStartString="http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" catalog="file:///etc/xml/xml-core.xml"/>
  <delegatePublic publicIdStartString="-//OASIS//DTD XML Catalogs V1.0//EN" catalog="file:///etc/xml/xml-core.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD XML Exchange Table Model 19990315" catalog="file:///etc/xml/docbook-xml.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook" catalog="file:///etc/xml/docbook-xml.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook" catalog="file:///etc/xml/docbook-xml.xml"/>
-<delegatePublic publicIdStartString="-//W3C//DTD SVG" catalog="file:///etc/xml/sgml-data.xml"/>
-<delegatePublic publicIdStartString="ISO 8879:1986//ENTITIES" catalog="file:///etc/xml/sgml-data.xml"/>
-<delegateSystem systemIdStartString="/usr/share/sgml/dtd/qaml-xml.dtd" catalog="file:///etc/xml/sgml-data.xml"/>
-<delegateSystem systemIdStartString="/usr/share/sgml/dtd/svg" catalog="file:///etc/xml/sgml-data.xml"/>
-<delegateSystem systemIdStartString="http://docbook.org/xml/" catalog="file:///etc/xml/docbook-xml.xml"/>
-<delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///etc/xml/docbook-xsl.xml"/>
  <delegateSystem systemIdStartString="http://globaltranscorp.org/oasis/catalog/xml/tr9401.dtd" catalog="file:///etc/xml/xml-core.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" catalog="file:///etc/xml/xml-core.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/" catalog="file:///etc/xml/docbook-xml.xml"/>
-<delegateSystem systemIdStartString="http://www.w3.org/Graphics/SVG/1.1/" catalog="file:///etc/xml/sgml-data.xml"/>
-<delegateSystem systemIdStartString="http://www.w3.org/TR/2001/REC-SVG-20010904/" catalog="file:///etc/xml/sgml-data.xml"/>
-<delegateSystem systemIdStartString="http://xml.ascc.net/xml/resource/qaml-xml" catalog="file:///etc/xml/sgml-data.xml"/>
-<delegateURI uriStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///etc/xml/docbook-xsl.xml"/>
  <delegateURI uriStartString="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/" catalog="file:///etc/xml/rarian-compat.xml"/>
+<delegatePublic publicIdStartString="-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" catalog="file:///etc/xml/xml-core.xml"/>
  </catalog>
diff --git a/xml/docbook-xml.xml b/xml/docbook-xml.xml

deleted file mode 100644 (file)

index bea23bd..0000000
--- a/xml/docbook-xml.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
-  "file:///usr/share/xml/schema/xml-core/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-<delegatePublic publicIdStartString="-//Normal Walsh//Exchange Table Model 19960430 XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//DTD CALS Table Model XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBk XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBook XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//ELEMENTS DocBook XML Information Pool V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBook XML Additional General Entities V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.1//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD XML Exchange Table Model 19990315//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegateSystem systemIdStartString="http://docbook.org/xml/4.1.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegateSystem systemIdStartString="http://docbook.org/xml/4.1/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
-<delegateSystem systemIdStartString="http://docbook.org/xml/4.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegateSystem systemIdStartString="http://docbook.org/xml/4.3/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegateSystem systemIdStartString="http://docbook.org/xml/4.4/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegateSystem systemIdStartString="http://docbook.org/xml/4.5/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-</catalog>
diff --git a/xml/docbook-xsl.xml b/xml/docbook-xsl.xml

deleted file mode 100644 (file)

index 94bcaf5..0000000
--- a/xml/docbook-xsl.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
-  "file:///usr/share/xml/schema/xml-core/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-<delegateURI uriStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///usr/share/xml/docbook/stylesheet/docbook-xsl/catalog.xml"/>
-<delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///usr/share/xml/docbook/stylesheet/docbook-xsl/catalog.xml"/>
-</catalog>
diff --git a/xml/sgml-data.xml b/xml/sgml-data.xml

deleted file mode 100644 (file)

index 5273160..0000000
--- a/xml/sgml-data.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
-  "file:///usr/share/xml/schema/xml-core/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-<delegatePublic publicIdStartString="+//IDN faq.org//DTD Frequently Asked Questions" catalog="file:///usr/share/xml/qaml/catalog.xml"/>
-<delegatePublic publicIdStartString="+//ISBN 82-7640-023//DTD Frequently Asked Questions//EN" catalog="file:///usr/share/xml/qaml/catalog.xml"/>
-<delegatePublic publicIdStartString="-//W3C//DTD SVG" catalog="file:///usr/share/xml/svg/catalog.xml"/>
-<delegatePublic publicIdStartString="ISO 8879:1986//ENTITIES" catalog="file:///usr/share/xml/entities/xml-iso-entities-8879.1986/catalog.xml"/>
-<delegateSystem systemIdStartString="/usr/share/sgml/dtd/qaml-xml.dtd" catalog="file:///usr/share/xml/qaml/catalog.xml"/>
-<delegateSystem systemIdStartString="/usr/share/sgml/dtd/svg" catalog="file:///usr/share/xml/svg/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.w3.org/Graphics/SVG/1.1/" catalog="file:///usr/share/xml/svg/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.w3.org/TR/2001/REC-SVG-20010904/" catalog="file:///usr/share/xml/svg/catalog.xml"/>
-<delegateSystem systemIdStartString="http://xml.ascc.net/xml/resource/qaml-xml" catalog="file:///usr/share/xml/qaml/catalog.xml"/>
-</catalog>
diff --git a/zfs/zed.d/all-syslog.sh b/zfs/zed.d/all-syslog.sh

deleted file mode 120000 (symlink)

index 031a82f..0000000
--- a/zfs/zed.d/all-syslog.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/zfs-linux/zed.d/all-syslog.sh
-\ No newline at end of file
diff --git a/zfs/zed.d/data-notify.sh b/zfs/zed.d/data-notify.sh

deleted file mode 120000 (symlink)

index 4362419..0000000
--- a/zfs/zed.d/data-notify.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/zfs-linux/zed.d/data-notify.sh
-\ No newline at end of file
diff --git a/zfs/zed.d/pool_import-led.sh b/zfs/zed.d/pool_import-led.sh

deleted file mode 120000 (symlink)

index 39cfe22..0000000
--- a/zfs/zed.d/pool_import-led.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/zfs-linux/zed.d/pool_import-led.sh
-\ No newline at end of file
diff --git a/zfs/zed.d/resilver_finish-notify.sh b/zfs/zed.d/resilver_finish-notify.sh

deleted file mode 120000 (symlink)

index 0ea84b1..0000000
--- a/zfs/zed.d/resilver_finish-notify.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/zfs-linux/zed.d/resilver_finish-notify.sh
-\ No newline at end of file
diff --git a/zfs/zed.d/resilver_finish-start-scrub.sh b/zfs/zed.d/resilver_finish-start-scrub.sh

deleted file mode 120000 (symlink)

index 6b3c116..0000000
--- a/zfs/zed.d/resilver_finish-start-scrub.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/zfs-linux/zed.d/resilver_finish-start-scrub.sh
-\ No newline at end of file
diff --git a/zfs/zed.d/scrub_finish-notify.sh b/zfs/zed.d/scrub_finish-notify.sh

deleted file mode 120000 (symlink)

index 4165c0b..0000000
--- a/zfs/zed.d/scrub_finish-notify.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/zfs-linux/zed.d/scrub_finish-notify.sh
-\ No newline at end of file
diff --git a/zfs/zed.d/statechange-led.sh b/zfs/zed.d/statechange-led.sh

deleted file mode 120000 (symlink)

index cde4e88..0000000
--- a/zfs/zed.d/statechange-led.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/zfs-linux/zed.d/statechange-led.sh
-\ No newline at end of file
diff --git a/zfs/zed.d/statechange-notify.sh b/zfs/zed.d/statechange-notify.sh

deleted file mode 120000 (symlink)

index 8dd2050..0000000
--- a/zfs/zed.d/statechange-notify.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/zfs-linux/zed.d/statechange-notify.sh
-\ No newline at end of file
diff --git a/zfs/zed.d/vdev_attach-led.sh b/zfs/zed.d/vdev_attach-led.sh

deleted file mode 120000 (symlink)

index a40202c..0000000
--- a/zfs/zed.d/vdev_attach-led.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/zfs-linux/zed.d/vdev_attach-led.sh
-\ No newline at end of file
diff --git a/zfs/zed.d/vdev_clear-led.sh b/zfs/zed.d/vdev_clear-led.sh

deleted file mode 120000 (symlink)

index bb8d488..0000000
--- a/zfs/zed.d/vdev_clear-led.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/zfs-linux/zed.d/vdev_clear-led.sh
-\ No newline at end of file
diff --git a/zfs/zpool.d/dm-deps b/zfs/zpool.d/dm-deps

new file mode 120000 (symlink)

index 0000000..91c78fd
--- /dev/null
+++ b/zfs/zpool.d/dm-deps
@@ -0,0 +1 @@
+/usr/lib/zfs-linux/zpool.d/dm-deps
+\ No newline at end of file
diff --git a/zfs/zpool.d/slaves b/zfs/zpool.d/slaves

deleted file mode 120000 (symlink)

index b07e4dd..0000000
--- a/zfs/zpool.d/slaves
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/zfs-linux/zpool.d/slaves
-\ No newline at end of file
author	Frank Brehm <frank@brehm-online.com>
	Tue, 16 Aug 2022 07:14:00 +0000 (09:14 +0200)
committer	Frank Brehm <root@bruni.home.brehm-online.com>
	Tue, 16 Aug 2022 07:14:00 +0000 (09:14 +0200)
.etckeeper		patch \| blob \| history
NetworkManager/dispatcher.d/20-chrony	[deleted file]	patch \| blob \| history
X11/Xsession		patch \| blob \| history
X11/Xsession.d/20x11-common_process-args		patch \| blob \| history
X11/Xsession.d/60xbrlapi	[deleted file]	patch \| blob \| history
X11/Xsession.d/90x11-common_ssh-agent		patch \| blob \| history
X11/xinit/xinput.d/ja_JP	[deleted symlink]	patch \| blob \| history
X11/xinit/xinput.d/ko_KR	[deleted symlink]	patch \| blob \| history
X11/xinit/xinput.d/zh_CN	[deleted symlink]	patch \| blob \| history
X11/xinit/xinput.d/zh_HK	[deleted symlink]	patch \| blob \| history
X11/xinit/xinput.d/zh_SG	[deleted symlink]	patch \| blob \| history
X11/xinit/xinput.d/zh_TW	[deleted symlink]	patch \| blob \| history
alternatives/Mail	[new symlink]	patch \| blob
alternatives/Mail.1.gz	[new symlink]	patch \| blob
alternatives/dotlock	[deleted symlink]	patch \| blob \| history
alternatives/dotlock.1.gz	[deleted symlink]	patch \| blob \| history
alternatives/ebtables		patch \| blob \| history
alternatives/ebtables-restore		patch \| blob \| history
alternatives/ebtables-save		patch \| blob \| history
alternatives/frm	[deleted symlink]	patch \| blob \| history
alternatives/frm.1.gz	[deleted symlink]	patch \| blob \| history
alternatives/from	[deleted symlink]	patch \| blob \| history
alternatives/from.1.gz	[deleted symlink]	patch \| blob \| history
alternatives/ftp	[deleted symlink]	patch \| blob \| history
alternatives/ftp.1.gz	[deleted symlink]	patch \| blob \| history
alternatives/gdm3-theme.gresource	[deleted symlink]	patch \| blob \| history
alternatives/ip6tables		patch \| blob \| history
alternatives/ip6tables-restore		patch \| blob \| history
alternatives/ip6tables-save		patch \| blob \| history
alternatives/ip6tables.service	[deleted symlink]	patch \| blob \| history
alternatives/iptables		patch \| blob \| history
alternatives/iptables-restore		patch \| blob \| history
alternatives/iptables-save		patch \| blob \| history
alternatives/iptables.service	[deleted symlink]	patch \| blob \| history
alternatives/lzip	[deleted symlink]	patch \| blob \| history
alternatives/lzip-compressor	[deleted symlink]	patch \| blob \| history
alternatives/lzip-compressor.1.gz	[deleted symlink]	patch \| blob \| history
alternatives/lzip-compressor.info.gz	[deleted symlink]	patch \| blob \| history
alternatives/lzip-decompressor	[deleted symlink]	patch \| blob \| history
alternatives/lzip-decompressor.1.gz	[deleted symlink]	patch \| blob \| history
alternatives/lzip-decompressor.info.gz	[deleted symlink]	patch \| blob \| history
alternatives/lzip.1.gz	[deleted symlink]	patch \| blob \| history
alternatives/lzip.info.gz	[deleted symlink]	patch \| blob \| history
alternatives/mail		patch \| blob \| history
alternatives/mail.1.gz		patch \| blob \| history
alternatives/mailx		patch \| blob \| history
alternatives/mailx.1.gz		patch \| blob \| history
alternatives/messages	[deleted symlink]	patch \| blob \| history
alternatives/messages.1.gz	[deleted symlink]	patch \| blob \| history
alternatives/movemail	[deleted symlink]	patch \| blob \| history
alternatives/movemail.1.gz	[deleted symlink]	patch \| blob \| history
alternatives/netrc.5.gz	[deleted symlink]	patch \| blob \| history
alternatives/open	[new symlink]	patch \| blob
alternatives/open.1.gz	[new symlink]	patch \| blob
alternatives/pftp	[deleted symlink]	patch \| blob \| history
alternatives/pftp.1.gz	[deleted symlink]	patch \| blob \| history
alternatives/pybabel		patch \| blob \| history
alternatives/readmsg	[deleted symlink]	patch \| blob \| history
alternatives/readmsg.1.gz	[deleted symlink]	patch \| blob \| history
alternatives/tdbbackup	[deleted symlink]	patch \| blob \| history
alternatives/tdbbackup.8.gz	[deleted symlink]	patch \| blob \| history
alternatives/traceroute6		patch \| blob \| history
alternatives/traceroute6.1.gz	[new symlink]	patch \| blob
alternatives/traceroute6.8.gz	[deleted symlink]	patch \| blob \| history
alternatives/w	[deleted symlink]	patch \| blob \| history
alternatives/w.1.gz	[deleted symlink]	patch \| blob \| history
alternatives/which	[new symlink]	patch \| blob
alternatives/which.1.gz	[new symlink]	patch \| blob
alternatives/which.de1.gz	[new symlink]	patch \| blob
alternatives/which.es1.gz	[new symlink]	patch \| blob
alternatives/which.fr1.gz	[new symlink]	patch \| blob
alternatives/which.it1.gz	[new symlink]	patch \| blob
alternatives/which.ja1.gz	[new symlink]	patch \| blob
alternatives/which.pl1.gz	[new symlink]	patch \| blob
alternatives/which.sl1.gz	[new symlink]	patch \| blob
alternatives/wx-config	[deleted symlink]	patch \| blob \| history
alternatives/xinput-ja_JP	[deleted symlink]	patch \| blob \| history
alternatives/xinput-ko_KR	[deleted symlink]	patch \| blob \| history
alternatives/xinput-zh_CN	[deleted symlink]	patch \| blob \| history
alternatives/xinput-zh_HK	[deleted symlink]	patch \| blob \| history
alternatives/xinput-zh_SG	[deleted symlink]	patch \| blob \| history
alternatives/xinput-zh_TW	[deleted symlink]	patch \| blob \| history
ansible/ansible.cfg	[deleted file]	patch \| blob \| history
ansible/hosts	[deleted file]	patch \| blob \| history
apparmor.d/usr.sbin.tcpdump	[deleted file]	patch \| blob \| history
apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg	[deleted file]	patch \| blob \| history
cron.daily/apt-compat		patch \| blob \| history
cron.daily/bsdmainutils	[deleted file]	patch \| blob \| history
cron.daily/dpkg		patch \| blob \| history
cron.daily/mlocate	[deleted file]	patch \| blob \| history
cron.daily/update-notifier-common	[deleted file]	patch \| blob \| history
cron.weekly/update-notifier-common	[deleted file]	patch \| blob \| history
dbus-1/system.d/org.freedesktop.Accounts.conf	[deleted file]	patch \| blob \| history
debian_version		patch \| blob \| history
default/bsdmainutils	[deleted file]	patch \| blob \| history
dhcp/dhclient-enter-hooks.d/resolved	[deleted file]	patch \| blob \| history
dpkg/origins/debian		patch \| blob \| history
fonts/conf.avail/30-metric-aliases.conf		patch \| blob \| history
fonts/conf.avail/45-latin.conf		patch \| blob \| history
fonts/conf.avail/57-dejavu-sans-mono.conf		patch \| blob \| history
fonts/conf.avail/57-dejavu-sans.conf		patch \| blob \| history
fonts/conf.avail/57-dejavu-serif.conf		patch \| blob \| history
fuse.conf		patch \| blob \| history
group.org	[new file with mode: 0644]	patch \| blob
init.d/hwclock.sh		patch \| blob \| history
init.d/network-manager	[deleted file]	patch \| blob \| history
init.d/pppd-dns	[deleted file]	patch \| blob \| history
init.d/procps		patch \| blob \| history
init.d/rsyslog	[deleted file]	patch \| blob \| history
init.d/x11-common		patch \| blob \| history
issue		patch \| blob \| history
issue.net		patch \| blob \| history
libreoffice/registry/oo-ad-ldap.xcd.sample	[new symlink]	patch \| blob
libreoffice/registry/oo-ldap.xcd.sample	[new symlink]	patch \| blob
libvirt/nwfilter/allow-arp.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/allow-dhcp-server.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/allow-dhcp.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/allow-incoming-ipv4.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/allow-ipv4.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/clean-traffic-gateway.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/clean-traffic.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/no-arp-ip-spoofing.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/no-arp-mac-spoofing.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/no-arp-spoofing.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/no-ip-multicast.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/no-ip-spoofing.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/no-mac-broadcast.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/no-mac-spoofing.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/no-other-l2-traffic.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/no-other-rarp-traffic.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/qemu-announce-self-rarp.xml	[deleted file]	patch \| blob \| history
libvirt/nwfilter/qemu-announce-self.xml	[deleted file]	patch \| blob \| history
libvirt/qemu/networks/default.xml	[deleted file]	patch \| blob \| history
libvirt/virt-login-shell.conf	[deleted file]	patch \| blob \| history
lintianrc	[deleted file]	patch \| blob \| history
login.defs		patch \| blob \| history
lsb-release		patch \| blob \| history
mailcap		patch \| blob \| history
menu-methods/menu-xdg	[changed mode: 0755->0644]	patch \| blob \| history
menu-methods/xdg-desktop-entry-spec-apps	[changed mode: 0755->0644]	patch \| blob \| history
menu-methods/xdg-desktop-entry-spec-dirs	[changed mode: 0755->0644]	patch \| blob \| history
menu-methods/xdg-desktop-entry-spec-sessions	[changed mode: 0755->0644]	patch \| blob \| history
mime.types		patch \| blob \| history
mysql/mariadb.cnf		patch \| blob \| history
network/if-down.d/bridge	[new symlink]	patch \| blob
network/if-post-down.d/avahi-daemon	[deleted symlink]	patch \| blob \| history
network/if-up.d/avahi-daemon	[deleted file]	patch \| blob \| history
pam.d/common-auth		patch \| blob \| history
pam.d/common-password		patch \| blob \| history
pam.d/su		patch \| blob \| history
pam.d/systemd-user	[deleted file]	patch \| blob \| history
passwd		patch \| blob \| history
passwd.org	[new file with mode: 0644]	patch \| blob
perl/XML/SAX/ParserDetails.ini		patch \| blob \| history
postfix/dynamicmaps.cf		patch \| blob \| history
printcap	[deleted symlink]	patch \| blob \| history
profile		patch \| blob \| history
profile.d/vte-2.91.sh		patch \| blob \| history
profile.d/vte.csh		patch \| blob \| history
python3.10/sitecustomize.py	[new file with mode: 0644]	patch \| blob
rc2.d/S01mintsystem	[deleted symlink]	patch \| blob \| history
rc3.d/S01mintsystem	[deleted symlink]	patch \| blob \| history
rc4.d/S01mintsystem	[deleted symlink]	patch \| blob \| history
rc5.d/S01mintsystem	[deleted symlink]	patch \| blob \| history
resolvconf/update-libc.d/avahi-daemon	[deleted file]	patch \| blob \| history
security/namespace.conf		patch \| blob \| history
security/pam_env.conf		patch \| blob \| history
services		patch \| blob \| history
sgml/metacity-common.cat	[deleted file]	patch \| blob \| history
shadow.org	[new file with mode: 0644]	patch \| blob
speech-dispatcher/modules/baratinoo.conf	[deleted file]	patch \| blob \| history
speech-dispatcher/modules/espeak-generic.conf	[deleted file]	patch \| blob \| history
speech-dispatcher/modules/ibmtts.conf	[deleted file]	patch \| blob \| history
speech-dispatcher/modules/ivona.conf	[deleted file]	patch \| blob \| history
speech-dispatcher/modules/kali.conf	[deleted file]	patch \| blob \| history
speech-dispatcher/modules/pico-generic.conf	[deleted file]	patch \| blob \| history
ssl/openssl.cnf		patch \| blob \| history
sysctl.conf		patch \| blob \| history
sysctl.d/10-kernel-hardening.conf		patch \| blob \| history
sysctl.d/README.sysctl		patch \| blob \| history
systemd/journald.conf		patch \| blob \| history
systemd/logind.conf		patch \| blob \| history
systemd/networkd.conf		patch \| blob \| history
systemd/pstore.conf		patch \| blob \| history
systemd/resolved.conf		patch \| blob \| history
systemd/sleep.conf		patch \| blob \| history
systemd/system.conf		patch \| blob \| history
systemd/system/multi-user.target.wants/ondemand.service	[deleted symlink]	patch \| blob \| history
systemd/system/timers.target.wants/dpkg-db-backup.timer	[new symlink]	patch \| blob
systemd/user.conf		patch \| blob \| history
systemd/user/graphical-session-pre.target.wants/session-migration.service	[new symlink]	patch \| blob
xattr.conf		patch \| blob \| history
xdg/autostart/nautilus-autostart.desktop	[deleted file]	patch \| blob \| history
xdg/autostart/tracker-extract.desktop	[deleted file]	patch \| blob \| history
xdg/autostart/tracker-miner-fs.desktop	[deleted file]	patch \| blob \| history
xdg/autostart/tracker-store.desktop	[deleted file]	patch \| blob \| history
xdg/katomic.knsrc	[deleted file]	patch \| blob \| history
xdg/kblocks.knsrc	[deleted file]	patch \| blob \| history
xdg/kcardtheme.knsrc	[deleted file]	patch \| blob \| history
xdg/kdiamond.knsrc	[deleted file]	patch \| blob \| history
xdg/kgoldrunner.knsrc	[deleted file]	patch \| blob \| history
xdg/kigo-games.knsrc	[deleted file]	patch \| blob \| history
xdg/kigo.knsrc	[deleted file]	patch \| blob \| history
xdg/kpat.knsrc	[deleted file]	patch \| blob \| history
xdg/ksirk.knsrc	[deleted file]	patch \| blob \| history
xdg/ksnakeduel.knsrc	[deleted file]	patch \| blob \| history
xml/catalog		patch \| blob \| history
xml/docbook-xml.xml	[deleted file]	patch \| blob \| history
xml/docbook-xsl.xml	[deleted file]	patch \| blob \| history
xml/sgml-data.xml	[deleted file]	patch \| blob \| history
zfs/zed.d/all-syslog.sh	[deleted symlink]	patch \| blob \| history
zfs/zed.d/data-notify.sh	[deleted symlink]	patch \| blob \| history
zfs/zed.d/pool_import-led.sh	[deleted symlink]	patch \| blob \| history
zfs/zed.d/resilver_finish-notify.sh	[deleted symlink]	patch \| blob \| history
zfs/zed.d/resilver_finish-start-scrub.sh	[deleted symlink]	patch \| blob \| history
zfs/zed.d/scrub_finish-notify.sh	[deleted symlink]	patch \| blob \| history
zfs/zed.d/statechange-led.sh	[deleted symlink]	patch \| blob \| history
zfs/zed.d/statechange-notify.sh	[deleted symlink]	patch \| blob \| history
zfs/zed.d/vdev_attach-led.sh	[deleted symlink]	patch \| blob \| history
zfs/zed.d/vdev_clear-led.sh	[deleted symlink]	patch \| blob \| history
zfs/zpool.d/dm-deps	[new symlink]	patch \| blob
zfs/zpool.d/slaves	[deleted symlink]	patch \| blob \| history