committing changes in /etc after apt run

author mhoellein <mhoellein@homeserver.homeip.net>

Tue, 23 Oct 2018 21:28:45 +0000 (23:28 +0200)

committer root <root@homeserver.homeip.net>

Tue, 23 Oct 2018 21:28:45 +0000 (23:28 +0200)
author mhoellein <mhoellein@homeserver.homeip.net>
Tue, 23 Oct 2018 21:28:45 +0000 (23:28 +0200)
committer root <root@homeserver.homeip.net>
Tue, 23 Oct 2018 21:28:45 +0000 (23:28 +0200)
diff --git a/.etckeeper b/.etckeeper

index 58fce92f33bb263cf98c5e0157286e386dd6b8e9..c09527880d1d57f050e58ecf091bcd9edd40d454 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -12,8 +12,6 @@ mkdir -p './ODBCDataSources'
  mkdir -p './X11/xinit/xinitrc.d'
  mkdir -p './X11/xkb'
  mkdir -p './apparmor.d/force-complain'
-mkdir -p './apparmor.d/tunables/multiarch.d'
-mkdir -p './apt/trusted.gpg.d'
  mkdir -p './asterisk/manager.d'
  mkdir -p './binfmt.d'
  mkdir -p './brltty/Input/xw'
@@ -119,7 +117,6 @@ maybe chmod 0755 'X11/Xresources'
  maybe chmod 0644 'X11/Xresources/x11-common'
  maybe chmod 0755 'X11/Xsession'
  maybe chmod 0755 'X11/Xsession.d'
-maybe chmod 0644 'X11/Xsession.d/00upstart'
  maybe chmod 0644 'X11/Xsession.d/20x11-common_process-args'
  maybe chmod 0644 'X11/Xsession.d/30x11-common_xresources'
  maybe chmod 0644 'X11/Xsession.d/35x11-common_xhost-local'
@@ -142,7 +139,6 @@ maybe chmod 0644 'X11/Xsession.d/90x11-common_ssh-agent'
  maybe chmod 0644 'X11/Xsession.d/95dbus_update-activation-env'
  maybe chmod 0755 'X11/Xsession.d/98vboxadd-xclient'
  maybe chmod 0644 'X11/Xsession.d/99mint'
-maybe chmod 0644 'X11/Xsession.d/99upstart'
  maybe chmod 0644 'X11/Xsession.d/99x11-common_start'
  maybe chmod 0644 'X11/Xsession.options'
  maybe chmod 0644 'X11/Xwrapper.config'
@@ -730,6 +726,8 @@ maybe chmod 0644 'apt/sources.list.d/official-package-repositories.list'
  maybe chmod 0600 'apt/trustdb.gpg'
  maybe chmod 0644 'apt/trusted.gpg'
  maybe chmod 0755 'apt/trusted.gpg.d'
+maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg'
+maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg'
  maybe chmod 0644 'arpwatch.conf'
  maybe chown 'asterisk' 'asterisk'
  maybe chgrp 'asterisk' 'asterisk'
@@ -2092,6 +2090,7 @@ maybe chmod 0644 'default/kerneloops'
  maybe chmod 0644 'default/keyboard'
  maybe chmod 0664 'default/keyboard.pre-ubiquity'
  maybe chmod 0664 'default/locale'
+maybe chmod 0644 'default/motd-news'
  maybe chmod 0644 'default/networking'
  maybe chmod 0644 'default/nfs-common'
  maybe chmod 0644 'default/nss'
@@ -2447,6 +2446,7 @@ maybe chmod 0644 'fonts/conf.avail/10-antialias.conf'
  maybe chmod 0644 'fonts/conf.avail/10-autohint.conf'
  maybe chmod 0644 'fonts/conf.avail/10-hinting-full.conf'
  maybe chmod 0644 'fonts/conf.avail/10-hinting-medium.conf'
+maybe chmod 0644 'fonts/conf.avail/10-hinting-none.conf'
  maybe chmod 0644 'fonts/conf.avail/10-hinting-slight.conf'
  maybe chmod 0644 'fonts/conf.avail/10-hinting.conf'
  maybe chmod 0644 'fonts/conf.avail/10-no-sub-pixel.conf'
@@ -2472,6 +2472,7 @@ maybe chmod 0644 'fonts/conf.avail/30-droid-noto.conf'
  maybe chmod 0644 'fonts/conf.avail/30-metric-aliases.conf'
  maybe chmod 0644 'fonts/conf.avail/30-urw-aliases.conf'
  maybe chmod 0644 'fonts/conf.avail/40-nonlatin.conf'
+maybe chmod 0644 'fonts/conf.avail/45-generic.conf'
  maybe chmod 0644 'fonts/conf.avail/45-latin.conf'
  maybe chmod 0644 'fonts/conf.avail/49-sansserif.conf'
  maybe chmod 0644 'fonts/conf.avail/50-user.conf'
@@ -2483,6 +2484,7 @@ maybe chmod 0644 'fonts/conf.avail/57-dejavu-serif.conf'
  maybe chmod 0644 'fonts/conf.avail/58-dejavu-lgc-sans-mono.conf'
  maybe chmod 0644 'fonts/conf.avail/58-dejavu-lgc-sans.conf'
  maybe chmod 0644 'fonts/conf.avail/58-dejavu-lgc-serif.conf'
+maybe chmod 0644 'fonts/conf.avail/60-generic.conf'
  maybe chmod 0644 'fonts/conf.avail/60-latin.conf'
  maybe chmod 0644 'fonts/conf.avail/64-01-tlwg-kinnari.conf'
  maybe chmod 0644 'fonts/conf.avail/64-02-tlwg-norasi.conf'
@@ -2694,7 +2696,6 @@ maybe chmod 0755 'init.d/cgproxy'
  maybe chmod 0755 'init.d/checkfs.sh'
  maybe chmod 0755 'init.d/checkroot-bootclean.sh'
  maybe chmod 0755 'init.d/checkroot.sh'
-maybe chmod 0755 'init.d/console-setup'
  maybe chmod 0755 'init.d/cpufrequtils'
  maybe chmod 0755 'init.d/cron'
  maybe chmod 0755 'init.d/cups'
@@ -2717,7 +2718,6 @@ maybe chmod 0755 'init.d/iodined'
  maybe chmod 0755 'init.d/irqbalance'
  maybe chmod 0755 'init.d/isc-dhcp-server'
  maybe chmod 0755 'init.d/kerneloops'
-maybe chmod 0755 'init.d/keyboard-setup'
  maybe chmod 0755 'init.d/killprocs'
  maybe chmod 0755 'init.d/kmod'
  maybe chmod 0755 'init.d/lightdm'
@@ -2796,7 +2796,6 @@ maybe chmod 0644 'init/alsa-state.conf'
  maybe chmod 0644 'init/alsa-store.conf'
  maybe chmod 0644 'init/alsa-utils.conf'
  maybe chmod 0644 'init/anacron.conf'
-maybe chmod 0644 'init/apparmor.conf'
  maybe chmod 0644 'init/atd.conf'
  maybe chmod 0644 'init/avahi-cups-reload.conf'
  maybe chmod 0644 'init/avahi-daemon.conf'
@@ -2808,15 +2807,11 @@ maybe chmod 0644 'init/cgproxy.conf'
  maybe chmod 0644 'init/checkfs.sh.conf'
  maybe chmod 0644 'init/checkroot-bootclean.sh.conf'
  maybe chmod 0644 'init/checkroot.sh.conf'
-maybe chmod 0644 'init/console-font.conf'
-maybe chmod 0644 'init/console-setup.conf'
  maybe chmod 0644 'init/console.conf'
  maybe chmod 0644 'init/container-detect.conf'
  maybe chmod 0644 'init/control-alt-delete.conf'
-maybe chmod 0644 'init/cron.conf'
  maybe chmod 0644 'init/cups-browsed.conf'
  maybe chmod 0644 'init/cups.conf'
-maybe chmod 0644 'init/dbus.conf'
  maybe chmod 0644 'init/dmesg.conf'
  maybe chmod 0644 'init/docker.conf'
  maybe chmod 0644 'init/dovecot.conf'
@@ -2836,7 +2831,6 @@ maybe chmod 0644 'init/idmapd.conf'
  maybe chmod 0644 'init/irqbalance.conf'
  maybe chmod 0644 'init/isc-dhcp-server.conf'
  maybe chmod 0644 'init/isc-dhcp-server6.conf'
-maybe chmod 0644 'init/kmod.conf'
  maybe chmod 0644 'init/lightdm.conf'
  maybe chmod 0644 'init/modemmanager.conf'
  maybe chmod 0644 'init/mosquitto.conf'
@@ -2866,7 +2860,6 @@ maybe chmod 0644 'init/network-manager.override'
  maybe chmod 0644 'init/networking.conf'
  maybe chmod 0644 'init/nmbd.conf'
  maybe chmod 0644 'init/oem-config.conf'
-maybe chmod 0644 'init/passwd.conf'
  maybe chmod 0644 'init/php7.2-fpm.conf'
  maybe chmod 0644 'init/plymouth-log.conf'
  maybe chmod 0644 'init/plymouth-ready.conf'
@@ -2889,7 +2882,6 @@ maybe chmod 0644 'init/rpcbind-boot.conf'
  maybe chmod 0644 'init/rpcbind.conf'
  maybe chmod 0644 'init/rsyslog.conf'
  maybe chmod 0644 'init/samba-ad-dc.conf'
-maybe chmod 0644 'init/setvtrgb.conf'
  maybe chmod 0644 'init/shutdown.conf'
  maybe chmod 0644 'init/smbd.conf'
  maybe chmod 0644 'init/ssh.conf'
@@ -3002,8 +2994,6 @@ maybe chmod 0644 'java-8-openjdk/security/nss.cfg'
  maybe chmod 0644 'java-8-openjdk/sound.properties'
  maybe chmod 0644 'java-8-openjdk/swing.properties'
  maybe chmod 0755 'kbd'
-maybe chmod 0644 'kbd/config'
-maybe chmod 0644 'kbd/remap'
  maybe chmod 0755 'kernel'
  maybe chmod 0644 'kernel-img.conf'
  maybe chmod 0755 'kernel/header_postinst.d'
@@ -3381,7 +3371,6 @@ maybe chmod 0644 'modprobe.d/blacklist.conf'
  maybe chmod 0644 'modprobe.d/dkms.conf'
  maybe chmod 0644 'modprobe.d/fbdev-blacklist.conf'
  maybe chmod 0644 'modprobe.d/iwlwifi.conf'
-maybe chmod 0644 'modprobe.d/mlx4.conf'
  maybe chmod 0644 'modprobe.d/vmwgfx-fbdev.conf'
  maybe chmod 0644 'modules'
  maybe chmod 0755 'modules-load.d'
@@ -4594,6 +4583,7 @@ maybe chmod 0640 'ufw/user6.rules'
  maybe chmod 0755 'update-motd.d'
  maybe chmod 0755 'update-motd.d/00-header'
  maybe chmod 0755 'update-motd.d/10-help-text'
+maybe chmod 0755 'update-motd.d/50-motd-news'
  maybe chmod 0644 'updatedb.conf'
  maybe chmod 0644 'upstart-xsessions'
  maybe chmod 0755 'upstream-release'
diff --git a/X11/Xsession.d/00upstart b/X11/Xsession.d/00upstart

deleted file mode 100644 (file)

index 8bf0374..0000000
--- a/X11/Xsession.d/00upstart
+++ /dev/null
@@ -1,12 +0,0 @@
-# Make ubuntu-upstart an alias for ubuntu
-if grep -q "^$DESKTOP_SESSION\$" /etc/upstart-xsessions; then
-    export XDG_CONFIG_DIRS="/usr/share/upstart/xdg:/etc/xdg"
-
-    BASESESSION=${1% *}
-    BASESESSION=${BASESESSION##*/}
-    if [ "$BASESESSION" = x-session-manager ]; then
-        BASESESSION=$(basename $(readlink /etc/alternatives/x-session-manager))
-    fi
-
-    UPSTART=1
-fi
diff --git a/X11/Xsession.d/60x11-common_xdg_path b/X11/Xsession.d/60x11-common_xdg_path

index 29491c3ea2ea70166e2f579b5472ad468bafc2de..b3ac04bb52f498eb7266ddd87544338c6740bde6 100644 (file)
--- a/X11/Xsession.d/60x11-common_xdg_path
+++ b/X11/Xsession.d/60x11-common_xdg_path
@@ -1,21 +1,24 @@
  # This file is sourced by Xsession(5), not executed.
-# Add additionnal xdg paths depending on selected desktop session
+# Add additional xdg paths depending on selected desktop session
  
  DEFAULT_XDG_CONFIG_DIRS='/etc/xdg'
  DEFAULT_XDG_DATA_DIRS='/usr/local/share/:/usr/share/'
  if [ -n "$DESKTOP_SESSION" ]; then
    # readd default if was empty
    if [ -z "$XDG_CONFIG_DIRS" ]; then
-    XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"
+    XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"/xdg-"$DESKTOP_SESSION":"$DEFAULT_XDG_CONFIG_DIRS"
+  elif [ -n "${XDG_CONFIG_DIRS##*$DEFAULT_XDG_CONFIG_DIRS/xdg-$DESKTOP_SESSION*}" ]; then
+    XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"/xdg-"$DESKTOP_SESSION":"$XDG_CONFIG_DIRS"
    fi
-  XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"/xdg-"$DESKTOP_SESSION":"$XDG_CONFIG_DIRS"
    export XDG_CONFIG_DIRS
    # gnome is already added if gnome-session installed
    if [ "$DESKTOP_SESSION" != "gnome" ]; then
       if [ -z "$XDG_DATA_DIRS" ]; then
         XDG_DATA_DIRS="$DEFAULT_XDG_DATA_DIRS"
       fi
-     XDG_DATA_DIRS=/usr/share/"$DESKTOP_SESSION":"$XDG_DATA_DIRS"
+     if [ -n "${XDG_DATA_DIRS##*/usr/share/$DESKTOP_SESSION*}" ]; then
+       XDG_DATA_DIRS=/usr/share/"$DESKTOP_SESSION":"$XDG_DATA_DIRS"
+      fi
       export XDG_DATA_DIRS
    fi
  fi
diff --git a/X11/Xsession.d/99upstart b/X11/Xsession.d/99upstart

deleted file mode 100644 (file)

index 4a9cbbf..0000000
--- a/X11/Xsession.d/99upstart
+++ /dev/null
@@ -1,14 +0,0 @@
-# Start the user session
-if [ -n "$UPSTART" ]; then
-    case "$BASESESSION" in
-        gnome-session*|gnome-flashback*)
-            export SESSIONTYPE=gnome-session
-            ;;
-        lxsession*)
-            export SESSIONTYPE=lxsession
-            ;;
-    esac
-
-    STARTUP="/sbin/upstart --user"
-    unset UPSTART
-fi
diff --git a/apt/trusted.gpg b/apt/trusted.gpg

index 7ac2b05b89d43d746071ef79c8c2a5024eddf314..1744163b42fadb64629fd90d80482aaca25a7a7e 100644 (file)

Binary files a/apt/trusted.gpg and b/apt/trusted.gpg differ
diff --git a/apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg b/apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg

new file mode 100644 (file)

index 0000000..7752314

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

new file mode 100644 (file)

index 0000000..63271f9

Binary files /dev/null and b/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg differ
diff --git a/bash.bashrc b/bash.bashrc

index 740fb9a1036f98ae547b863b6461111522291365..ec92e54be2ebab4c4734d559cdc4905c6c5600e3 100644 (file)
--- a/bash.bashrc
+++ b/bash.bashrc
@@ -16,7 +16,10 @@ if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
  fi
  
  # set a fancy prompt (non-color, overwrite the one in /etc/profile)
-PS1='${debian_chroot:+($debian_chroot)}\u@\h \w \$ '
+# but only if not SUDOing and have SUDO_PS1 set; then assume smart user.
+if ! [ -n "${SUDO_USER}" -a -n "${SUDO_PS1}" ]; then
+  PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
  
  # Commented out, don't overwrite xterm -T "title" -n "icontitle" by default.
  # If this is an xterm set the title to user@host:dir
@@ -37,6 +40,19 @@ PS1='${debian_chroot:+($debian_chroot)}\u@\h \w \$ '
  #  fi
  #fi
  
+# sudo hint
+if [ ! -e "$HOME/.sudo_as_admin_successful" ] && [ ! -e "$HOME/.hushlogin" ] ; then
+    case " $(groups) " in *\ admin\ *|*\ sudo\ *)
+    if [ -x /usr/bin/sudo ]; then
+       cat <<-EOF
+       To run a command as administrator (user "root"), use "sudo <command>".
+       See "man sudo_root" for details.
+       
+       EOF
+    fi
+    esac
+fi
+
  # if the command-not-found package is installed, use it
  if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-not-found ]; then
         function command_not_found_handle {
diff --git a/debian_version b/debian_version

index b0b57ed4ac7e21bf42c78a783eb8ea3f8b65bc90..2834e5822e25b78ca17b20524a64febb26237c7a 100644 (file)
--- a/debian_version
+++ b/debian_version
@@ -1 +1 @@
-stretch/sid
+buster/sid
diff --git a/default/motd-news b/default/motd-news

new file mode 100644 (file)

index 0000000..eefe29c
--- /dev/null
+++ b/default/motd-news
@@ -0,0 +1,19 @@
+# Enable/disable the dynamic MOTD news service
+# This is a useful way to provide dynamic, informative
+# information pertinent to the users and administrators
+# of the local system
+ENABLED=0
+
+# Configure the source of dynamic MOTD news
+# White space separated list of 0 to many news services
+# For security reasons, these must be https
+# and have a valid certificate
+# Canonical runs a service at motd.ubuntu.com, and you
+# can easily run one too
+URLS="https://motd.ubuntu.com"
+
+# Specify the time in seconds, you're willing to wait for
+# dynamic MOTD news
+# Note that news messages are fetched in the background by
+# a systemd timer, so this should never block boot or login
+WAIT=5
diff --git a/fonts/conf.avail/10-antialias.conf b/fonts/conf.avail/10-antialias.conf

index 62d86d4702124da4bbf64ce5db8751b40967fb84..913d11709ad54106742bc126dbc66e1ac55f0657 100644 (file)
--- a/fonts/conf.avail/10-antialias.conf
+++ b/fonts/conf.avail/10-antialias.conf
@@ -1,8 +1,8 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
-<!--  Use the Antialiasing --> 
-  <match target="font">
-    <edit name="antialias" mode="assign"><bool>true</bool></edit>
+<!--  Use the Antialiasing -->
+  <match target="pattern">
+    <edit name="antialias" mode="append"><bool>true</bool></edit>
    </match>
  </fontconfig>
diff --git a/fonts/conf.avail/10-hinting-full.conf b/fonts/conf.avail/10-hinting-full.conf

index 3d00d928860a5028df557b14c399207a1a7fcb4c..27d8229195c647c3576383363632cb70cb053808 100644 (file)
--- a/fonts/conf.avail/10-hinting-full.conf
+++ b/fonts/conf.avail/10-hinting-full.conf
@@ -1,8 +1,13 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
-<!--  Use Full Hinting --> 
-  <match target="font">
-    <edit name="hintstyle" mode="assign"><const>hintfull</const></edit>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintfull</const></edit>
    </match>
  </fontconfig>
diff --git a/fonts/conf.avail/10-hinting-medium.conf b/fonts/conf.avail/10-hinting-medium.conf

index 34c2bf2abcaf8772ec3f3e48176b8f8b86e8fe52..e34ab5b344dc12b7aa5377bc59d6b57af38d6a36 100644 (file)
--- a/fonts/conf.avail/10-hinting-medium.conf
+++ b/fonts/conf.avail/10-hinting-medium.conf
@@ -1,8 +1,13 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
-<!--  Use Medium Hinting --> 
-  <match target="font">
-    <edit name="hintstyle" mode="assign"><const>hintmedium</const></edit>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintmedium</const></edit>
    </match>
  </fontconfig>
diff --git a/fonts/conf.avail/10-hinting-none.conf b/fonts/conf.avail/10-hinting-none.conf

new file mode 100644 (file)

index 0000000..0b3810d
--- /dev/null
+++ b/fonts/conf.avail/10-hinting-none.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintnone</const></edit>
+  </match>
+</fontconfig>
diff --git a/fonts/conf.avail/10-hinting-slight.conf b/fonts/conf.avail/10-hinting-slight.conf

index 073d30aaf67a3a4d1449a4bedf7d82a92598927d..c244ac0b0e856999d531ae8c7b014728ffdf77cc 100644 (file)
--- a/fonts/conf.avail/10-hinting-slight.conf
+++ b/fonts/conf.avail/10-hinting-slight.conf
@@ -1,8 +1,13 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
-<!--  Use Slight Hinting --> 
-  <match target="font">
-    <edit name="hintstyle" mode="assign"><const>hintslight</const></edit>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintslight</const></edit>
    </match>
  </fontconfig>
diff --git a/fonts/conf.avail/30-metric-aliases.conf b/fonts/conf.avail/30-metric-aliases.conf

index cd1e9246d01d166c6cd8a50c5784b719b71d9e3a..c755c5e96ca0dfd7610c4524b4e96201f201bab6 100644 (file)
--- a/fonts/conf.avail/30-metric-aliases.conf
+++ b/fonts/conf.avail/30-metric-aliases.conf
@@ -6,17 +6,17 @@
  
  Alias similar/metric-compatible families from various sources:
  
-PostScript fonts:       URW fonts:              GUST fonts:        Windows fonts:
-======================  ======================  =================  ==================
-Helvetica               Nimbus Sans             TeX Gyre Heros
-Helvetica Condensed     Nimbus Sans Narrow      TeX Gyre Heros Cn
-Times                   Nimbus Roman            TeX Gyre Termes
-Courier                 Nimbus Mono             TeX Gyre Cursor
-ITC Avant Garde Gothic  URW Gothic              TeX Gyre Adventor
-ITC Bookman             Bookman URW             TeX Gyre Bonum     Bookman Old Style
-ITC Zapf Chancery       Chancery URW            TeX Gyre Chorus
-Palatino                Palladio URW            TeX Gyre Pagella   Palatino Linotype
-New Century Schoolbook  Century SchoolBook URW  TeX Gyre Schola    Century Schoolbook
+PostScript fonts:       URW fonts:           GUST fonts:        Windows fonts:
+======================  ==================  =================  ==================
+Helvetica               Nimbus Sans         TeX Gyre Heros
+Helvetica Narrow        Nimbus Sans Narrow  TeX Gyre Heros Cn
+Times                   Nimbus Roman        TeX Gyre Termes
+Courier                 Nimbus Mono PS      TeX Gyre Cursor
+ITC Avant Garde Gothic  URW Gothic          TeX Gyre Adventor
+ITC Bookman             URW Bookman         TeX Gyre Bonum     Bookman Old Style
+ITC Zapf Chancery       Z003                TeX Gyre Chorus
+Palatino                P052                TeX Gyre Pagella   Palatino Linotype
+New Century Schoolbook  C059                TeX Gyre Schola    Century Schoolbook
  
  Microsoft fonts:  Liberation fonts:       Google CrOS core fonts:  StarOffice fonts:  AMT fonts:
  ================  ======================  =======================  =================  ==============
@@ -44,6 +44,9 @@ but in an order preferring similar designs first.  We do this in three steps:
  3) Alias each generic to its specifics.
     e.g. Arial to Liberation Sans, Arimo, Albany, and Albany AMT
  
+NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
+      upstream now includes them in their release of (URW)++ Core Font Set here:
+      https://github.com/ArtifexSoftware/urw-base35-fonts/tree/master/fontconfig
  -->
  
  <!-- Map specifics to generics -->
@@ -73,14 +76,14 @@ but in an order preferring similar designs first.  We do this in three steps:
         <alias binding="same">
           <family>Nimbus Sans Narrow</family>
           <default>
-         <family>Helvetica Condensed</family>
+         <family>Helvetica Narrow</family>
           </default>
         </alias>
  
         <alias binding="same">
           <family>TeX Gyre Heros Cn</family>
           <default>
-         <family>Helvetica Condensed</family>
+         <family>Helvetica Narrow</family>
           </default>
         </alias>
  
@@ -119,6 +122,13 @@ but in an order preferring similar designs first.  We do this in three steps:
           </default>
         </alias>
  
+       <alias binding="same">
+         <family>Nimbus Mono PS</family>
+         <default>
+         <family>Courier</family>
+         </default>
+       </alias>
+
         <alias binding="same">
           <family>TeX Gyre Cursor</family>
           <default>
@@ -175,6 +185,13 @@ but in an order preferring similar designs first.  We do this in three steps:
           </default>
         </alias>
  
+       <alias binding="same">
+         <family>URW Bookman</family>
+         <default>
+         <family>ITC Bookman</family>
+         </default>
+       </alias>
+
         <alias binding="same">
           <family>TeX Gyre Bonum</family>
           <default>
@@ -210,6 +227,13 @@ but in an order preferring similar designs first.  We do this in three steps:
           </default>
         </alias>
  
+       <alias binding="same">
+         <family>Z003</family>
+         <default>
+         <family>ITC Zapf Chancery</family>
+         </default>
+       </alias>
+
         <alias binding="same">
           <family>TeX Gyre Chorus</family>
           <default>
@@ -231,6 +255,13 @@ but in an order preferring similar designs first.  We do this in three steps:
           </default>
         </alias>
  
+       <alias binding="same">
+         <family>P052</family>
+         <default>
+         <family>Palatino</family>
+         </default>
+       </alias>
+
         <alias binding="same">
           <family>TeX Gyre Pagella</family>
           <default>
@@ -259,6 +290,13 @@ but in an order preferring similar designs first.  We do this in three steps:
           </default>
         </alias>
  
+       <alias binding="same">
+         <family>C059</family>
+         <default>
+         <family>New Century Schoolbook</family>
+         </default>
+       </alias>
+
         <alias binding="same">
           <family>TeX Gyre Schola</family>
           <default>
@@ -273,7 +311,6 @@ but in an order preferring similar designs first.  We do this in three steps:
           </default>
         </alias>
  
-
         <!-- Microsoft -->
         <alias binding="same">
           <family>Arimo</family>
@@ -405,7 +442,7 @@ but in an order preferring similar designs first.  We do this in three steps:
         </alias>
  
         <alias>
-         <family>Helvetica Condensed</family>
+         <family>Helvetica Narrow</family>
           <default>
           <family>Arial Narrow</family>
           </default>
@@ -425,7 +462,6 @@ but in an order preferring similar designs first.  We do this in three steps:
           </default>
         </alias>
  
-
         <!-- Microsoft -->
         <alias>
           <family>Arial</family>
@@ -437,7 +473,7 @@ but in an order preferring similar designs first.  We do this in three steps:
         <alias>
           <family>Arial Narrow</family>
           <default>
-         <family>Helvetica Condensed</family>
+         <family>Helvetica Narrow</family>
           </default>
         </alias>
  
@@ -455,8 +491,6 @@ but in an order preferring similar designs first.  We do this in three steps:
           </default>
         </alias>
  
-
-
  <!-- Map generics to specifics -->
  
         <!-- PostScript -->
@@ -464,16 +498,13 @@ but in an order preferring similar designs first.  We do this in three steps:
           <family>Helvetica</family>
           <accept>
           <family>TeX Gyre Heros</family>
-         <family>Nimbus Sans</family>
-         <family>Nimbus Sans L</family>
           </accept>
         </alias>
  
         <alias binding="same">
-         <family>Helvetica Condensed</family>
+         <family>Helvetica Narrow</family>
           <accept>
           <family>TeX Gyre Heros Cn</family>
-         <family>Nimbus Sans Narrow</family>
           </accept>
         </alias>
  
@@ -481,8 +512,6 @@ but in an order preferring similar designs first.  We do this in three steps:
           <family>Times</family>
           <accept>
           <family>TeX Gyre Termes</family>
-         <family>Nimbus Roman</family>
-         <family>Nimbus Roman No9 L</family>
           </accept>
         </alias>
  
@@ -490,8 +519,6 @@ but in an order preferring similar designs first.  We do this in three steps:
           <family>Courier</family>
           <accept>
           <family>TeX Gyre Cursor</family>
-         <family>Nimbus Mono</family>
-         <family>Nimbus Mono L</family>
           </accept>
         </alias>
  
@@ -499,8 +526,6 @@ but in an order preferring similar designs first.  We do this in three steps:
           <family>ITC Avant Garde Gothic</family>
           <accept>
           <family>TeX Gyre Adventor</family>
-         <family>URW Gothic</family>
-         <family>URW Gothic L</family>
           </accept>
         </alias>
  
@@ -509,8 +534,6 @@ but in an order preferring similar designs first.  We do this in three steps:
           <accept>
           <family>Bookman Old Style</family>
           <family>TeX Gyre Bonum</family>
-         <family>Bookman URW</family>
-         <family>URW Bookman L</family>
           </accept>
         </alias>
  
@@ -518,8 +541,6 @@ but in an order preferring similar designs first.  We do this in three steps:
           <family>ITC Zapf Chancery</family>
           <accept>
           <family>TeX Gyre Chorus</family>
-         <family>Chancery URW</family>
-         <family>URW Chancery L</family>
           </accept>
         </alias>
  
@@ -528,8 +549,6 @@ but in an order preferring similar designs first.  We do this in three steps:
           <accept>
           <family>Palatino Linotype</family>
           <family>TeX Gyre Pagella</family>
-         <family>Palladio URW</family>
-         <family>URW Palladio L</family>
           </accept>
         </alias>
  
@@ -538,8 +557,6 @@ but in an order preferring similar designs first.  We do this in three steps:
           <accept>
           <family>Century Schoolbook</family>
           <family>TeX Gyre Schola</family>
-         <family>Century SchoolBook URW</family>
-         <family>Century Schoolbook L</family>
           </accept>
         </alias>
  
diff --git a/fonts/conf.avail/40-nonlatin.conf b/fonts/conf.avail/40-nonlatin.conf

index b1f9885fc4909ed48d79fcf478bd2ab30e82c6b0..8e339171bf7bb99aca2b7b22ded200191ad39a28 100644 (file)
--- a/fonts/conf.avail/40-nonlatin.conf
+++ b/fonts/conf.avail/40-nonlatin.conf
@@ -61,10 +61,6 @@
                 <family>NanumMyeongjo</family>
                 <default><family>serif</family></default>
         </alias>
-       <alias>
-               <family>NanumMyeongjo</family>
-               <default><family>serif</family></default>
-       </alias>
         <alias>
                 <family>UnBatang</family>
                 <default><family>serif</family></default>
@@ -93,10 +89,6 @@
                 <family>FreeSerif</family>
                 <default><family>serif</family></default>
         </alias>
-       <alias>
-               <family>Baekmuk Gulim</family>
-               <default><family>sans-serif</family></default>
-       </alias>
         <alias>
                 <family>SimSun</family>
                 <default><family>serif</family></default>
@@ -164,12 +156,16 @@
                 <family>Baekmuk Dotum</family>
                 <default><family>sans-serif</family></default>
         </alias>
+       <alias>
+               <family>MgOpen Moderna</family>
+               <default><family>sans-serif</family></default>
+       </alias>
         <alias>
                 <family>MgOpen Modata</family>
                 <default><family>sans-serif</family></default>
         </alias>
         <alias>
-               <family>MgOpen Moderna</family>
+               <family>MgOpen Cosmetica</family>
                 <default><family>sans-serif</family></default>
         </alias>
         <alias>
diff --git a/fonts/conf.avail/45-generic.conf b/fonts/conf.avail/45-generic.conf

new file mode 100644 (file)

index 0000000..f6076bb
--- /dev/null
+++ b/fonts/conf.avail/45-generic.conf
@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Keep in sync with 60-generic.conf -->
+
+<!-- Emoji -->
+
+       <alias binding="same">
+               <family>Emoji Two</family>
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Emoji One</family>
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Noto Color Emoji</family> <!-- Google -->
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Apple Color Emoji</family> <!-- Apple -->
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Segoe UI Emoji</family> <!-- Microsoft -->
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Twitter Color Emoji</family> <!-- Twitter -->
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>EmojiOne Mozilla</family> <!-- Mozilla -->
+               <default><family>emoji</family></default>
+       </alias>
+       <!-- B&W -->
+       <alias binding="same">
+               <family>Noto Emoji</family> <!-- Google -->
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Android Emoji</family> <!-- Google -->
+               <default><family>emoji</family></default>
+       </alias>
+
+       <!-- Add language for emoji, to match other emoji fonts. -->
+       <match>
+               <test name="family">
+                       <string>emoji</string>
+               </test>
+               <edit name="lang" mode="prepend">
+                       <string>und-zsye</string>
+               </edit>
+       </match>
+
+       <match>
+               <test name="lang">
+                       <string>und-zsye</string>
+               </test>
+               <test qual="all" name="family" compare="not_eq">
+                       <string>emoji</string>
+               </test>
+
+               <!-- Add generic family. -->
+               <edit name="family" mode="append" binding="strong">
+                       <string>emoji</string>
+               </edit>
+       </match>
+
+
+<!-- Math -->
+
+       <!-- https://en.wikipedia.org/wiki/Category:Mathematical_OpenType_typefaces -->
+       <alias binding="same">
+               <family>XITS Math</family> <!-- Khaled Hosny -->
+               <default><family>math</family></default>
+       </alias>
+       <alias binding="same">
+               <family>STIX Two Math</family> <!-- AMS -->
+               <default><family>math</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Cambria Math</family> <!-- Microsoft -->
+               <default><family>math</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Latin Modern Math</family> <!-- TeX -->
+               <default><family>math</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Minion Math</family> <!-- Adobe -->
+               <default><family>math</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Lucida Math</family> <!-- Adobe -->
+               <default><family>math</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Asana Math</family>
+               <default><family>math</family></default>
+       </alias>
+
+       <!-- Add language for math, to match other math fonts. -->
+       <match>
+               <test name="family">
+                       <string>math</string>
+               </test>
+               <edit name="lang" mode="prepend">
+                       <string>und-zmth</string>
+               </edit>
+       </match>
+
+       <match>
+               <test name="lang">
+                       <string>und-zmth</string>
+               </test>
+               <test qual="all" name="family" compare="not_eq">
+                       <string>math</string>
+               </test>
+
+               <!-- Add generic family -->
+               <edit name="family" mode="append" binding="strong">
+                       <string>math</string>
+               </edit>
+       </match>
+
+
+</fontconfig>
diff --git a/fonts/conf.avail/45-latin.conf b/fonts/conf.avail/45-latin.conf

index 72490f3286a014d090a2fd33904b7cad64a1f02a..c6696f8d6f24213dbeb36d76b36b686cd5d5f32a 100644 (file)
--- a/fonts/conf.avail/45-latin.conf
+++ b/fonts/conf.avail/45-latin.conf
@@ -13,20 +13,40 @@
                 <family>Bitstream Vera Serif</family>
                 <default><family>serif</family></default>
         </alias>
+       <alias>
+               <family>Cambria</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Constantia</family>
+               <default><family>serif</family></default>
+       </alias>
         <alias>
                 <family>DejaVu Serif</family>
                 <default><family>serif</family></default>
         </alias>
+       <alias>
+               <family>Elephant</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Garamond</family>
+               <default><family>serif</family></default>
+       </alias>
+       <alias>
+               <family>Georgia</family>
+               <default><family>serif</family></default>
+       </alias>
         <alias>
                 <family>Liberation Serif</family>
                 <default><family>serif</family></default>
         </alias>
         <alias>
-               <family>Times New Roman</family>
+               <family>Luxi Serif</family>
                 <default><family>serif</family></default>
         </alias>
         <alias>
-               <family>Times</family>
+               <family>MS Serif</family>
                 <default><family>serif</family></default>
         </alias>
         <alias>
@@ -38,7 +58,7 @@
                 <default><family>serif</family></default>
         </alias>
         <alias>
-               <family>Luxi Serif</family>
+               <family>Palatino Linotype</family>
                 <default><family>serif</family></default>
         </alias>
         <alias>
@@ -50,50 +70,74 @@
                 <default><family>serif</family></default>
         </alias>
         <alias>
-               <family>Georgia</family>
-               <default><family>serif</family></default>
-       </alias>
-       <alias>
-               <family>Garamond</family>
+               <family>Times New Roman</family>
                 <default><family>serif</family></default>
         </alias>
         <alias>
-               <family>Palatino Linotype</family>
+               <family>Times</family>
                 <default><family>serif</family></default>
         </alias>
  <!--
    Sans-serif faces
   -->
         <alias>
-               <family>Bitstream Vera Sans</family>
+               <family>Albany AMT</family>
                 <default><family>sans-serif</family></default>
         </alias>
         <alias>
-               <family>DejaVu Sans</family>
+               <family>Albany</family>
                 <default><family>sans-serif</family></default>
         </alias>
         <alias>
-               <family>Liberation Sans</family>
+               <family>Arial Unicode MS</family>
                 <default><family>sans-serif</family></default>
         </alias>
         <alias>
                 <family>Arial</family>
                 <default><family>sans-serif</family></default>
         </alias>
+       <alias>
+               <family>Bitstream Vera Sans</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Britannic</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Calibri</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Candara</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Century Gothic</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Corbel</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>DejaVu Sans</family>
+               <default><family>sans-serif</family></default>
+       </alias>
         <alias>
                 <family>Helvetica</family>
                 <default><family>sans-serif</family></default>
         </alias>
         <alias>
-               <family>Verdana</family>
+               <family>Haettenschweiler</family>
                 <default><family>sans-serif</family></default>
         </alias>
         <alias>
-               <family>Albany AMT</family>
+               <family>Liberation Sans</family>
                 <default><family>sans-serif</family></default>
         </alias>
         <alias>
-               <family>Albany</family>
+               <family>MS Sans Serif</family>
                 <default><family>sans-serif</family></default>
         </alias>
         <alias>
@@ -108,51 +152,71 @@
                 <family>Luxi Sans</family>
                 <default><family>sans-serif</family></default>
         </alias>
+       <alias>
+               <family>Tahoma</family>
+               <default><family>sans-serif</family></default>
+       </alias>
         <alias>
                 <family>Trebuchet MS</family>
                 <default><family>sans-serif</family></default>
         </alias>
+       <alias>
+               <family>Twentieth Century</family>
+               <default><family>sans-serif</family></default>
+       </alias>
+       <alias>
+               <family>Verdana</family>
+               <default><family>sans-serif</family></default>
+       </alias>
  <!--
    Monospace faces
   -->
+       <alias>
+               <family>Andale Mono</family>
+               <default><family>monospace</family></default>
+       </alias>
         <alias>
                 <family>Bitstream Vera Sans Mono</family>
                 <default><family>monospace</family></default>
         </alias>
         <alias>
-               <family>DejaVu Sans Mono</family>
+               <family>Consolas</family>
                 <default><family>monospace</family></default>
         </alias>
         <alias>
-               <family>Liberation Mono</family>
+               <family>Courier New</family>
                 <default><family>monospace</family></default>
         </alias>
         <alias>
-               <family>Inconsolata</family>
+               <family>Courier</family>
                 <default><family>monospace</family></default>
         </alias>
         <alias>
-               <family>Courier New</family>
+               <family>Cumberland AMT</family>
                 <default><family>monospace</family></default>
         </alias>
         <alias>
-               <family>Courier</family>
+               <family>Cumberland</family>
                 <default><family>monospace</family></default>
         </alias>
         <alias>
-               <family>Andale Mono</family>
+               <family>DejaVu Sans Mono</family>
                 <default><family>monospace</family></default>
         </alias>
         <alias>
-               <family>Luxi Mono</family>
+               <family>Fixedsys</family>
                 <default><family>monospace</family></default>
         </alias>
         <alias>
-               <family>Cumberland AMT</family>
+               <family>Inconsolata</family>
                 <default><family>monospace</family></default>
         </alias>
         <alias>
-               <family>Cumberland</family>
+               <family>Liberation Mono</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Luxi Mono</family>
                 <default><family>monospace</family></default>
         </alias>
         <alias>
@@ -163,38 +227,46 @@
                 <family>Nimbus Mono</family>
                 <default><family>monospace</family></default>
         </alias>
+       <alias>
+               <family>Nimbus Mono PS</family>
+               <default><family>monospace</family></default>
+       </alias>
+       <alias>
+               <family>Terminal</family>
+               <default><family>monospace</family></default>
+       </alias>
  <!--
    Fantasy faces
   -->
-       <alias>
-               <family>Impact</family>
+       <alias>
+               <family>Bauhaus Std</family>
                 <default><family>fantasy</family></default>
         </alias>
         <alias>
-               <family>Copperplate Gothic Std</family>
+               <family>Cooper Std</family>
                 <default><family>fantasy</family></default>
         </alias>
         <alias>
-               <family>Cooper Std</family>
+               <family>Copperplate Gothic Std</family>
                 <default><family>fantasy</family></default>
         </alias>
         <alias>
-               <family>Bauhaus Std</family>
+               <family>Impact</family>
                 <default><family>fantasy</family></default>
         </alias>
  <!--
    Cursive faces
    -->
         <alias>
-               <family>ITC Zapf Chancery Std</family>
+               <family>Comic Sans MS</family>
                 <default><family>cursive</family></default>
         </alias>
         <alias>
-               <family>Zapfino</family>
+               <family>ITC Zapf Chancery Std</family>
                 <default><family>cursive</family></default>
         </alias>
         <alias>
-               <family>Comic Sans MS</family>
+               <family>Zapfino</family>
                 <default><family>cursive</family></default>
         </alias>
  
diff --git a/fonts/conf.avail/53-monospace-lcd-filter.conf b/fonts/conf.avail/53-monospace-lcd-filter.conf

index c9d8b9753ad2856399f0d46659201a6233e6cd07..92b786bf49e1980c5fb8f26c63582b6ff38ba1ca 100644 (file)
--- a/fonts/conf.avail/53-monospace-lcd-filter.conf
+++ b/fonts/conf.avail/53-monospace-lcd-filter.conf
@@ -3,7 +3,7 @@
  <!-- conf.d/monospace-lcd-filter.conf -->
  <fontconfig>
  <!--  Use legacy LCD filter on smaller Monospace fonts -->
-  <match target="font">
+  <match target="pattern">
      <test name="family">
        <string>DejaVu Sans Mono</string>
        <string>Bitstream Vera Sans Mono</string>
@@ -12,10 +12,10 @@
        <double>12.0</double>
      </test>
  
-    <edit name="lcd_filter" mode="assign">
+    <edit name="lcd_filter" mode="append">
        <const>lcdlegacy</const>
      </edit>
-    <edit name="hintstyle" mode="assign">
+    <edit name="hintstyle" mode="append">
        <const>hintfull</const>
      </edit>
    </match>
diff --git a/fonts/conf.avail/60-generic.conf b/fonts/conf.avail/60-generic.conf

new file mode 100644 (file)

index 0000000..2a2b809
--- /dev/null
+++ b/fonts/conf.avail/60-generic.conf
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Keep in sync with 45-generic.conf -->
+
+<!-- Emoji -->
+
+       <!-- Prefer to match color emoji font. -->
+       <match>
+               <test name="lang">
+                       <string>und-zsye</string>
+               </test>
+               <test qual="all" name="color" compare="not_eq">
+                       <bool>true</bool>
+               </test>
+               <test qual="all" name="color" compare="not_eq">
+                       <bool>false</bool>
+               </test>
+               <edit name="color" mode="append">
+                       <bool>true</bool>
+               </edit>
+       </match>
+
+       <!-- TODO
+        ! Match on "color" and alias B&W ones first if no color is requested.
+        ! That's "hard" because <alias> doesn't work in match and needs to be
+        ! expanded to its non-sugar form.
+        !-->
+       <alias binding="same">
+               <family>emoji</family>
+               <prefer>
+                       <family>Emoji Two</family>
+                       <family>Emoji One</family>
+                       <!-- System fonts -->
+                       <family>Noto Color Emoji</family> <!-- Google -->
+                       <family>Apple Color Emoji</family> <!-- Apple -->
+                       <family>Segoe UI Emoji</family> <!-- Microsoft -->
+                       <family>Twitter Color Emoji</family> <!-- Twitter -->
+                       <family>EmojiOne Mozilla</family> <!-- Mozilla -->
+                       <!-- Non-color -->
+                       <family>Noto Emoji</family> <!-- Google -->
+                       <family>Android Emoji</family> <!-- Google -->
+               </prefer>
+       </alias>
+
+<!-- Math -->
+       <alias binding="same">
+               <!-- https://en.wikipedia.org/wiki/Category:Mathematical_OpenType_typefaces -->
+               <family>math</family>
+               <prefer>
+                       <family>XITS Math</family> <!-- Khaled Hosny -->
+                       <family>STIX Two Math</family> <!-- AMS -->
+                       <family>Cambria Math</family> <!-- Microsoft -->
+                       <family>Latin Modern Math</family> <!-- TeX -->
+                       <family>Minion Math</family> <!-- Adobe -->
+                       <family>Lucida Math</family> <!-- Adobe -->
+                       <family>Asana Math</family>
+               </prefer>
+       </alias>
+
+</fontconfig>
diff --git a/fonts/conf.avail/60-latin.conf b/fonts/conf.avail/60-latin.conf

index 8604f70e5c4d64e5c5a6b42fcaedd9f4dc8b661a..7ea29abaf649b23ad19afdf6548209433769e881 100644 (file)
--- a/fonts/conf.avail/60-latin.conf
+++ b/fonts/conf.avail/60-latin.conf
@@ -43,6 +43,7 @@
                         <family>Luxi Mono</family>
                         <family>Nimbus Mono L</family>
                         <family>Nimbus Mono</family>
+                       <family>Nimbus Mono PS</family>
                         <family>Courier</family>
                 </prefer>
         </alias>
diff --git a/fonts/conf.avail/65-nonlatin.conf b/fonts/conf.avail/65-nonlatin.conf

index 9306f74922ff79e4797dfa57afc9ab4f7214f1cb..90b5347d36dcba3bd14f38e418065b5c32ceb9b4 100644 (file)
--- a/fonts/conf.avail/65-nonlatin.conf
+++ b/fonts/conf.avail/65-nonlatin.conf
@@ -19,8 +19,6 @@
                         <family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
                         <family>Raghindi</family> <!-- devanagari -->
                         <family>Mukti Narrow</family> <!-- bengali -->
-                       <family>malayalam</family> <!-- malayalam -->
-                       <family>Sampige</family> <!-- kannada -->
                         <family>padmaa</family> <!-- gujarati -->
                         <family>Hapax Berbère</family> <!-- tifinagh -->
                         <family>MS Mincho</family> <!-- han (ja) -->
@@ -58,7 +56,7 @@
                         <family>Lohit Sindhi</family>
                         <family>Lohit Punjabi</family>
                         <family>Lohit Tamil</family>
-                       <family>Meera</family>
+                       <family>Rachana</family>
                         <family>Lohit Malayalam</family>
                         <family>Lohit Kannada</family>
                         <family>Lohit Telugu</family>
@@ -90,20 +88,19 @@
                         <family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
                         <family>Raghindi</family> <!-- devanagari -->
                         <family>Mukti Narrow</family> <!-- bengali -->
-                       <family>malayalam</family> <!-- malayalam -->
-                       <family>Sampige</family> <!-- kannada -->
                         <family>padmaa</family> <!-- gujarati -->
                         <family>Hapax Berbère</family> <!-- tifinagh -->
                         <family>MS Gothic</family> <!-- han (ja) -->
                         <family>UmePlus P Gothic</family> <!-- han (ja) -->
-                       <!-- chinese fonts are actually serifed -->
-                       <family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
-                       <family>PMingLiu</family> <!-- han (zh-tw) -->
+                       <family>Microsoft YaHei</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>Microsoft JhengHei</family> <!-- han (zh-tw) -->
                         <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
                         <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
                         <family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
                         <family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>MgOpen Moderna</family>
                         <family>MgOpen Modata</family>
+                       <family>MgOpen Cosmetica</family>
                         <family>VL Gothic</family>
                         <family>IPAMonaGothic</family>
                         <family>IPAGothic</family>
@@ -116,7 +113,6 @@
                         <family>AR PL Mingti2L Big5</family>
                         <family>ＭＳ ゴシック</family>
                         <family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
-                       <family>TSCu_Paranar</family> <!-- tamil -->
                         <family>NanumGothic</family> <!-- hangul (ko) -->
                         <family>UnDotum</family> <!-- hangul (ko) -->
                         <family>Baekmuk Dotum</family> <!-- hangul (ko) -->
diff --git a/fonts/conf.d/10-hinting.conf b/fonts/conf.d/10-hinting.conf

deleted file mode 120000 (symlink)

index 0cdcb1b..0000000
--- a/fonts/conf.d/10-hinting.conf
+++ /dev/null
@@ -1 +0,0 @@
-../conf.avail/10-hinting.conf
-\ No newline at end of file
diff --git a/fonts/conf.d/30-urw-aliases.conf b/fonts/conf.d/30-urw-aliases.conf

deleted file mode 120000 (symlink)

index 227e03d..0000000
--- a/fonts/conf.d/30-urw-aliases.conf
+++ /dev/null
@@ -1 +0,0 @@
-../conf.avail/30-urw-aliases.conf
-\ No newline at end of file
diff --git a/fonts/conf.d/45-generic.conf b/fonts/conf.d/45-generic.conf

new file mode 120000 (symlink)

index 0000000..1f25c2c
--- /dev/null
+++ b/fonts/conf.d/45-generic.conf
@@ -0,0 +1 @@
+../conf.avail/45-generic.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/60-generic.conf b/fonts/conf.d/60-generic.conf

new file mode 120000 (symlink)

index 0000000..aba0e09
--- /dev/null
+++ b/fonts/conf.d/60-generic.conf
@@ -0,0 +1 @@
+../conf.avail/60-generic.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/69-language-selector-ja.conf b/fonts/conf.d/69-language-selector-ja.conf

new file mode 120000 (symlink)

index 0000000..7136c20
--- /dev/null
+++ b/fonts/conf.d/69-language-selector-ja.conf
@@ -0,0 +1 @@
+../conf.avail/69-language-selector-ja.conf
+\ No newline at end of file
diff --git a/fonts/fonts.conf b/fonts/fonts.conf

index a1e4b53c2ca8c5936955f3b7095f6689bfb5b0a0..79b86b72142b4dec153182354a0a1f545da583f4 100644 (file)
--- a/fonts/fonts.conf
+++ b/fonts/fonts.conf
@@ -65,6 +65,20 @@
                 </edit>
         </match>
  
+<!--
+  Ignore dpkg temporary files created in fonts directories
+-->
+       <selectfont>
+               <rejectfont>
+                       <glob>*.dpkg-tmp</glob>
+               </rejectfont>
+       </selectfont>
+       <selectfont>
+               <rejectfont>
+                       <glob>*.dpkg-new</glob>
+               </rejectfont>
+       </selectfont>
+
  <!--
    Load local system customization file
  -->
diff --git a/init.d/console-setup b/init.d/console-setup

deleted file mode 100755 (executable)

index 29a17f9..0000000
--- a/init.d/console-setup
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          console-setup
-# Required-Start:    $remote_fs
-# Required-Stop:
-# Should-Start:      console-screen kbd
-# Default-Start:     S
-# Default-Stop:
-# X-Interactive:     true
-# Short-Description: Set console keymap
-### END INIT INFO
-
-set -e
-
-# This script is used jointly by console-setup and console-setup-mini.
-# It belongs to keyboard-configuration because it is forbidden two
-# different packages to share common configuration file.
-
-test -f /usr/bin/loadkeys || exit 0
-
-if [ -f /etc/default/locale ]; then
-    # In order to permit auto-detection of the charmap when
-    # console-setup-mini operates without configuration file.
-    . /etc/default/locale
-    export LANG
-fi
-
-if [ -f /lib/lsb/init-functions ]; then
-    . /lib/lsb/init-functions
-else
-    log_action_begin_msg () {
-       echo -n "$@... "
-    }
-
-    log_action_end_msg () {
-       if [ "$1" -eq 0 ]; then 
-           echo done.
-       else
-           echo failed.
-       fi
-    }
-fi
-
-case "$1" in
-    stop|status)
-        # console-setup isn't a daemon
-        ;;
-    start|force-reload|restart|reload)
-       if loadkeys /etc/console-setup/cached.kmap.gz ; then
-           log_action_end_msg 0
-       else
-           log_action_end_msg $?
-       fi
-       ;;
-    *)
-        echo 'Usage: /etc/init.d/console-setup {start|reload|restart|force-reload|stop|status}'
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/init.d/keyboard-setup b/init.d/keyboard-setup

deleted file mode 100755 (executable)

index c757491..0000000
--- a/init.d/keyboard-setup
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          keyboard-setup
-# Required-Start:    mountkernfs
-# Required-Stop:
-# Should-Start:      keymap udev
-# X-Start-Before:    checkroot
-# Default-Start:     S
-# Default-Stop:
-# X-Interactive:     true
-# Short-Description: Set preliminary keymap
-# Description:       Set the console keyboard as early as possible
-#                    so during the file systems checks the administrator
-#                    can interact.  At this stage of the boot process
-#                    only the ASCII symbols are supported.
-### END INIT INFO
-
-set -e
-
-# This script is not used by keyboard-configuration.  It is used
-# jointly by console-setup and console-setup-mini
-
-test -f /bin/setupcon || exit 0
-
-if [ -f /etc/default/locale ]; then
-    # In order to permit auto-detection of the charmap when
-    # console-setup-mini operates without configuration file.
-    . /etc/default/locale
-    export LANG
-fi
-
-if [ -f /lib/lsb/init-functions ]; then
-    . /lib/lsb/init-functions
-else
-    log_action_begin_msg () {
-       echo -n "$@... "
-    }
-
-    log_action_end_msg () {
-       if [ "$1" -eq 0 ]; then 
-           echo done.
-       else
-           echo failed.
-       fi
-    }
-fi
-
-case "$1" in
-    stop|status)
-        # keyboard-setup isn't a daemon
-        ;;
-    start|force-reload|restart|reload)
-       # If plymouth is running, then the console may be in raw mode and
-       # loadkeys will do confusing things to the keymap, so don't try.
-       if ! type plymouth >/dev/null || ! plymouth --ping; then
-           log_action_begin_msg "Setting preliminary keymap"
-           if setupcon -k --force 2>/dev/null; then
-               log_action_end_msg 0
-           else
-               log_action_end_msg $?
-           fi
-       fi
-       ;;
-    *)
-        echo 'Usage: /etc/init.d/keyboard-setup {start|reload|restart|force-reload|stop|status}'
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/init/apparmor.conf b/init/apparmor.conf

deleted file mode 100644 (file)

index 9024234..0000000
--- a/init/apparmor.conf
+++ /dev/null
@@ -1,97 +0,0 @@
-description "Pre-cache and pre-load apparmor profiles"
-author "Dimitri John Ledkov <xnox@ubuntu.com> and Jamie Strandboge <jamie@ubuntu.com>"
-
-task
-
-start on starting rc-sysinit
-
-script
-    [ -d /rofs/etc/apparmor.d ]  && exit 0 # do not load on liveCD
-    [ -d /sys/module/apparmor ]  || exit 0 # do not load without AppArmor
-    [ -x /sbin/apparmor_parser ] || exit 0 # do not load without parser
-
-    . /lib/apparmor/functions
-
-    systemd-detect-virt --quiet --container && ! is_container_with_internal_policy && exit 0 || true
-
-    # Need securityfs for any mode
-    if [ ! -d /sys/kernel/security/apparmor ]; then
-        if cut -d" " -f2,3 /proc/mounts | grep -q "^/sys/kernel/security securityfs"'$' ; then
-            exit 0
-        else
-            mount -t securityfs none /sys/kernel/security || exit 0
-        fi
-    fi
-
-    [ -w /sys/kernel/security/apparmor/.load ] || exit 0
-
-    apparmor_was_updated=0
-    if ! compare_previous_version ; then
-        # On snappy flavors, if the current and previous versions are
-        # different then clear the system cache. snappy will handle
-        # "$PROFILES_CACHE_VAR" itself  (on Touch flavors
-        # compare_previous_version  always returns '0' since snappy
-        # isn't available).
-        clear_cache_system
-        apparmor_was_updated=1
-    elif ! compare_and_save_debsums apparmor ; then
-        # If the system policy has been updated since the last time we
-        # ran, clear the cache to prevent potentially stale binary
-        # cache files after an Ubuntu image based upgrade (LP:
-        # #1350673). This can be removed once all system image flavors
-        # move to snappy (on snappy systems compare_and_save_debsums
-        # always returns '0' since /var/lib/dpkg doesn't exist).
-        clear_cache
-        apparmor_was_updated=1
-    fi
-
-    if [ -x /usr/bin/aa-clickhook ] || [ -x /usr/bin/aa-profile-hook ] ; then
-        # If packages for system policy that affect click packages have
-        # been updated since the last time we ran, run aa-clickhook -f
-        force_clickhook=0
-        force_profile_hook=0
-        if ! compare_and_save_debsums apparmor-easyprof-ubuntu ; then
-            force_clickhook=1
-        fi
-        if ! compare_and_save_debsums apparmor-easyprof-ubuntu-snappy ; then
-            force_clickhook=1
-        fi
-        if ! compare_and_save_debsums click-apparmor ; then
-            force_clickhook=1
-            force_profile_hook=1
-        fi
-        if [ -x /usr/bin/aa-clickhook ] && ([ $force_clickhook -eq 1 ] || [ $apparmor_was_updated -eq 1 ]) ; then
-            aa-clickhook -f
-        fi
-        if [ -x /usr/bin/aa-profile-hook ] && ([ $force_profile_hook -eq 1 ] || [ $apparmor_was_updated -eq 1 ]) ; then
-            aa-profile-hook -f
-        fi
-    fi
-
-    if [ "$ACTION" = "teardown" ]; then
-        running_profile_names | while read profile; do
-            unload_profile "$profile"
-        done
-        exit 0
-    fi
-
-    if [ "$ACTION" = "clear" ]; then
-        clear_cache
-        exit 0
-    fi
-
-    if [ "$ACTION" = "reload" ] || [ "$ACTION" = "force-reload" ]; then
-        clear_cache
-        load_configured_profiles
-        exit 0
-    fi
-
-    # Note: if apparmor-easyprof-ubuntu md5sums didn't match up above,
-    # aa-clickhook will have already compiled the policy, generated the cache
-    # files and loaded them into the kernel by this point, so reloading click
-    # policy from cache, while fairly fast (<2 seconds for 250 profiles on
-    # armhf), is redundant. Fixing this would complicate the logic quite a bit
-    # and it wouldn't improve the (by far) common case (ie, when
-    # 'aa-clickhook -f' is not run).
-    load_configured_profiles
-end script
diff --git a/init/console-font.conf b/init/console-font.conf

deleted file mode 100644 (file)

index 11b5aa3..0000000
--- a/init/console-font.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# console-font - set console font
-#
-# Set the console font, in case the similar udev rule races with Plymouth
-# and thus fails to do it.
-
-description    "set console font"
-
-start on starting plymouth-splash
-
-task
-
-exec /lib/udev/console-setup-tty fbcon
diff --git a/init/console-setup.conf b/init/console-setup.conf

deleted file mode 100644 (file)

index be207cc..0000000
--- a/init/console-setup.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# console-setup - set console keymap
-#
-# Set the console keyboard as early as possible so that the administrator
-# can interact with the system during file system checks.  The keymap may be
-# set on any virtual console as long as it isn't in raw mode; loadkeys will
-# go and look for one such, and fail if it can't find one.
-
-description    "set console keymap"
-
-start on (virtual-filesystems
-          or starting rcS
-          or starting mountall-shell)
-
-task
-
-exec loadkeys /etc/console-setup/cached.kmap.gz
diff --git a/init/cron.conf b/init/cron.conf

deleted file mode 100644 (file)

index 655f01c..0000000
--- a/init/cron.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# cron - regular background program processing daemon
-#
-# cron is a standard UNIX program that runs user-specified programs at
-# periodic scheduled times
-
-description    "regular background program processing daemon"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-expect fork
-respawn
-
-exec cron
diff --git a/init/dbus.conf b/init/dbus.conf

deleted file mode 100644 (file)

index f9dde85..0000000
--- a/init/dbus.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# dbus - D-Bus system message bus
-#
-# The D-Bus system message bus allows system daemons and user applications
-# to communicate.
-
-description    "D-Bus system message bus"
-
-start on filesystem
-stop on deconfiguring-networking
-
-expect fork
-respawn
-
-pre-start script
-    mkdir -p /var/run/dbus
-    chown messagebus:messagebus /var/run/dbus
-
-    exec dbus-uuidgen --ensure
-end script
-
-exec dbus-daemon --system --fork
-
-post-start exec kill -USR1 1
-
-post-stop exec rm -f /var/run/dbus/pid
diff --git a/init/kmod.conf b/init/kmod.conf

deleted file mode 100644 (file)

index 72536fd..0000000
--- a/init/kmod.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# kmod - load modules from /etc/modules
-#
-# This task loads the kernel modules specified in the /etc/modules file
-
-description    "load modules from /etc/modules"
-
-start on (startup
-         and started udev)
-
-task
-script
-    [ -f /etc/modules ] && files="/etc/modules" || files=""
-    hash="#"
-    dirs="/etc/modules-load.d /run/modules-load.d /lib/modules-load.d"
-    for dir in $dirs; do
-        files="$files $(run-parts --list --regex='\.conf$' $dir 2> /dev/null || true)"
-    done
-    for file in $files; do
-        while read module args; do
-           [ -n "$module" ] && [ "${module#${hash}}" = "${module}" ] || continue
-           modprobe $module $args || :
-        done < $file
-    done
-end script
diff --git a/init/passwd.conf b/init/passwd.conf

deleted file mode 100644 (file)

index 8258142..0000000
--- a/init/passwd.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# passwd - clear locks on passwd and related files
-#
-# Copyright 2012 Canonical Ltd.
-# Author: Dmitrijs Ledkovs
-#
-# This helper clears locks on passwd to avoid million duplicate bug reports
-# like this one: https://launchpad.net/bugs/523896
-# Ideally we'd know what lock-up, and doesn't clear the lock, and fix that.
-# But it appears to be safe enough to clear them unconditionally on boot.
-#
-
-description    "Clear passwd locks"
-
-start on filesystem
-
-task
-
-exec rm -f /etc/gshadow.lock /etc/shadow.lock /etc/passwd.lock /etc/group.lock /etc/subuid.lock /etc/subgid.lock
diff --git a/init/setvtrgb.conf b/init/setvtrgb.conf

deleted file mode 100644 (file)

index 193796c..0000000
--- a/init/setvtrgb.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# setvtrgb - set virtual terminal colors
-#
-# This job configures the virtual terminal console colors
-
-author "Dustin Kirkland <kirkland@canonical.com>"
-
-start on (started plymouth-splash or started tty1)
-
-exec setvtrgb /etc/vtrgb
diff --git a/issue b/issue

index e9f3d138739fa904f618be804ca2dd9b3265c2d7..ef94eb1b9b025c1fe9eb1d39bf0ebbf89d45ccff 100644 (file)
--- a/issue
+++ b/issue
@@ -1,2 +1,2 @@
-Linux Mint 18.3 Sylvia \n \l
+Linux Mint 19 Tara \n \l
  
diff --git a/issue.net b/issue.net

index 851f1e3c4a8f27c16cdfcade9d05b7cbc57cf63e..d8906fd8e904e4bd75fca0735cad6c0ac374d3ca 100644 (file)
--- a/issue.net
+++ b/issue.net
@@ -1 +1 @@
-Linux Mint 18.3 Sylvia
-\ No newline at end of file
+Linux Mint 19 Tara
diff --git a/kbd/config b/kbd/config

deleted file mode 100644 (file)

index 134672e..0000000
--- a/kbd/config
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# This files tells the 'kbd' package:
-#
-# - whether to load a specific font and boot (and maybe a screen-font map,
-#   but you should avoid that if possible).
-# - whether to setup an Application-Charset Map other than the default CP437.
-# - whether to do screen saver/DPMS settings
-# - whether to change the keyboard rate/delay or the state of the
-#   keyboard indicators 
-# - whether to show a clock
-#
-# You can also specify per-VC settings by suffixing variable names as in
-# the examples below. This only works on framebuffer devices.
-#
-# For consistency with the configuration file of console-tools the
-# following variables and their _vcN versions are also supported:
-# SCREEN_FONT, SCREEN_FONT_MAP and APP_CHARSET_MAP.
-#
-#
-# Example:
-#
-#CONSOLE_FONT=iso01.f16
-#CONSOLE_FONT_vc2=LatArCyrHeb-16
-#
-#CONSOLE_MAP=iso05
-#CONSOLE_MAP_vc2=user
-#
-# Set the following - more euro-friendly default than kernel font.
-#CONSOLE_FONT=latarcyrheb-sun16.psf
-
-# Forget this one unless you _know_ it is necessary for your font:
-#FONT_MAP=iso01
-
-#  **** screen saver/DPMS settings: all VCs ****
-# These settings are commented by default to avoid the chance of damage to
-# very old monitors that don't support DPMS signalling.
-
-# screen blanking timeout.  monitor remains on, but the screen is cleared to
-# range: 0-60 min (0==never)  kernels I've looked at default to 10 minutes.
-# (see linux/drivers/char/console.c)
-# This is set to zero to avoid blanking the screen, because if a crash occurs
-# it can conceal the output. On systems running with a graphical desktop, X
-# is responsible for dpms settings, so this will not affect systems running
-# graphically, and it makes more since for a non graphical system to not blank
-# the screen automatically as most non graphical systems are headless unless
-# a monitor has been attached for debugging
-BLANK_TIME=0
-
-# blanking method (VESA DPMS mode to use after BLANK_TIME, before powerdown):
-# on: the default, no DPMS signalling. near instant powerup, no power saving
-# vsync: DPMS Standby mode. nearly instant recovery, uses 110/120W (17" screen)
-# hsync: DPMS Suspend mode. typically 3s recovery, uses 15/120W (17" screen)
-# powerdown,off: DPMS Off mode, typ. 10s recovery, uses  5/120W (17" screen)
-
-# Those values are for my 17" Mag, but some monitors do suspend the same as
-# standby.  xset dpms force {off|standby|suspend|on} is useful for this, if X
-# supports DPMS on your video card.  Set X's DPMS screensaver with xset dpms
-# or use option power_saver in XF86Config
-#
-# DPMS set by default to on, because hsync can cause problems on certain
-# hardware, such as Armada E500 laptops
-BLANK_DPMS=off
-
-# Powerdown time.  The console will go to DPMS Off mode POWERDOWN_TIME
-# minutes _after_ blanking.  (POWERDOWN_TIME + BLANK_TIME after the last input)
-POWERDOWN_TIME=30
-
-# rate and delay can get only specific values, consult kbdrate(1) for help
-#KEYBOARD_RATE="30"
-#KEYBOARD_DELAY="250"
-
-# Turn on numlock by default
-#LEDS=+num
-
-# Display a clock in the right upper corner of the console by running vcstime
-#DO_VCSTIME=yes
diff --git a/kbd/remap b/kbd/remap

deleted file mode 100644 (file)

index c66430f..0000000
--- a/kbd/remap
+++ /dev/null
@@ -1,5 +0,0 @@
-# This sed script is run across the dumpkeys output to remap keys on the console
-
-# This turns caps lock into control
-#s/keycode  58 = Caps_Lock/keycode  58 = Control/;
-
diff --git a/ld.so.conf.d/i386-linux-gnu.conf b/ld.so.conf.d/i386-linux-gnu.conf

index c0f73cedd46594b2723551abe6d31d9f1a940f01..13c8b26d23f4ed5fa030bc7986c306757fd6aea6 100644 (file)
--- a/ld.so.conf.d/i386-linux-gnu.conf
+++ b/ld.so.conf.d/i386-linux-gnu.conf
@@ -1,5 +1,7 @@
  # Multiarch support
+/usr/local/lib/i386-linux-gnu
  /lib/i386-linux-gnu
  /usr/lib/i386-linux-gnu
+/usr/local/lib/i686-linux-gnu
  /lib/i686-linux-gnu
  /usr/lib/i686-linux-gnu
diff --git a/ld.so.conf.d/x86_64-linux-gnu.conf b/ld.so.conf.d/x86_64-linux-gnu.conf

index 4856a62a77ceec7bf637ceb8cd74a17176b9bc2a..cd691abf25641c708683e142bb6cefbca36003f4 100644 (file)
--- a/ld.so.conf.d/x86_64-linux-gnu.conf
+++ b/ld.so.conf.d/x86_64-linux-gnu.conf
@@ -1,3 +1,4 @@
  # Multiarch support
+/usr/local/lib/x86_64-linux-gnu
  /lib/x86_64-linux-gnu
  /usr/lib/x86_64-linux-gnu
diff --git a/legal b/legal

index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bac9c714d4a7930053aee9aa8a311db2e4c1af3b 100644 (file)
--- a/legal
+++ b/legal
@@ -0,0 +1 @@
+   
diff --git a/login.defs b/login.defs

index 09f4d6373a2a0b841e05f8660da0d384fe512588..7c32d63ec0ef5513eb2182d6c2da7ec451b9b920 100644 (file)
--- a/login.defs
+++ b/login.defs
@@ -218,7 +218,7 @@ DEFAULT_HOME        yes
  # (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
  # the same as gid, and username is the same as the primary group name.
  #
-# If set to yes, userdel will remove the user´s group if it contains no
+# If set to yes, userdel will remove the user's group if it contains no
  # more members, and useradd will create by default a group with the name
  # of the user.
  #
diff --git a/lsb-release b/lsb-release

index b7e63abd9656c5a4b631771d5048a547ac62142b..66908679a893a69abffc925e9f394537936221a8 100644 (file)
--- a/lsb-release
+++ b/lsb-release
@@ -1,4 +1,4 @@
  DISTRIB_ID=LinuxMint
-DISTRIB_RELEASE=18.3
-DISTRIB_CODENAME=sylvia
-DISTRIB_DESCRIPTION="Linux Mint 18.3 Sylvia"
+DISTRIB_RELEASE=19
+DISTRIB_CODENAME=tara
+DISTRIB_DESCRIPTION="Linux Mint 19 Tara"
diff --git a/mime.types b/mime.types

index 612758558a0ed18fea2c7a94de7ccccf7ed2cf64..3f31ff24a8dbe31227e063085abfcf5e76758cfc 100644 (file)
--- a/mime.types
+++ b/mime.types
@@ -733,6 +733,7 @@ text/h323                                   323
  text/html                                      html htm shtml
  text/iuls                                      uls
  text/mathml                                    mml
+text/markdown                                   md markdown
  text/parityfec
  text/plain                                     asc txt text pot brf srt
  text/prs.lines.tag
diff --git a/modprobe.d/mlx4.conf b/modprobe.d/mlx4.conf

deleted file mode 100644 (file)

index 2036c1d..0000000
--- a/modprobe.d/mlx4.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# mlx4_core gets automatically loaded, load mlx4_en also (LP: #1115710)
-softdep mlx4_core post: mlx4_en
diff --git a/pam.d/common-auth b/pam.d/common-auth

index e499fcfd2caf361bf12484ed1d9cd3b21c636aed..364fa54b13271c5701b073c277e467de72e07a2a 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/login b/pam.d/login

index 434d7a252353bb105f26566af10a9e947c0d92fa..07ff95407ccdd59b17a3c2a5371914c186713104 100644 (file)
--- a/pam.d/login
+++ b/pam.d/login
@@ -35,13 +35,23 @@ auth [success=ok new_authtok_reqd=ok ignore=ignore user_unknown=bad default=die]
  # (Replaces the `NOLOGINS_FILE' option from login.defs)
  auth       requisite  pam_nologin.so
  
-# SELinux needs to be the first session rule. This ensures that any 
-# lingering context has been cleared. Without out this it is possible 
+# SELinux needs to be the first session rule. This ensures that any
+# lingering context has been cleared. Without this it is possible
  # that a module could execute code in the wrong domain.
  # When the module is present, "required" would be sufficient (When SELinux
  # is disabled, this returns success.)
  session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
  
+# Sets the loginuid process attribute
+session    required     pam_loginuid.so
+
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
+# When the module is present, "required" would be sufficient (When SELinux
+# is disabled, this returns success.)
+
  # This module parses environment configuration file(s)
  # and also allows you to use an extended config
  # file /etc/security/pam_env.conf.
@@ -62,7 +72,7 @@ session       required   pam_env.so readenv=1 envfile=/etc/default/locale
  auth       optional   pam_group.so
  
  # Uncomment and edit /etc/security/time.conf if you need to set
-# time restrainst on logins.
+# time restraint on logins.
  # (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs
  # as well as /etc/porttime)
  # account    requisite  pam_time.so
@@ -76,18 +86,18 @@ auth       optional   pam_group.so
  # (Replaces the use of /etc/limits in old login)
  session    required   pam_limits.so
  
-# Prints the last login info upon succesful login
+# Prints the last login info upon successful login
  # (Replaces the `LASTLOG_ENAB' option from login.defs)
  session    optional   pam_lastlog.so
  
-# Prints the message of the day upon succesful login.
+# Prints the message of the day upon successful login.
  # (Replaces the `MOTD_FILE' option in login.defs)
  # This includes a dynamically generated part from /run/motd.dynamic
  # and a static (admin-editable) part from /etc/motd.
  session    optional   pam_motd.so motd=/run/motd.dynamic
  session    optional   pam_motd.so noupdate
  
-# Prints the status of the user's mailbox upon succesful login
+# Prints the status of the user's mailbox upon successful login
  # (Replaces the `MAIL_CHECK_ENAB' option from login.defs). 
  #
  # This also defines the MAIL environment variable
@@ -97,17 +107,10 @@ session    optional   pam_motd.so noupdate
  # See comments in /etc/login.defs
  session    optional   pam_mail.so standard
  
-# Sets the loginuid process attribute
-session    required     pam_loginuid.so
+# Create a new session keyring.
+session    optional   pam_keyinit.so force revoke
  
  # Standard Un*x account and session
  @include common-account
  @include common-session
  @include common-password
-
-# SELinux needs to intervene at login time to ensure that the process
-# starts in the proper default security context. Only sessions which are
-# intended to run in the user's context should be run after this.
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
-# When the module is present, "required" would be sufficient (When SELinux
-# is disabled, this returns success.)
diff --git a/profile b/profile

index 678ecc1ad8ef40328480bc9bb2d5197b2628439b..259b3b46c4b1efcabad1dcd84ae649a2c532423b 100644 (file)
--- a/profile
+++ b/profile
@@ -1,8 +1,8 @@
  # /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
  # and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
  
-if [ "$PS1" ]; then
-  if [ "$BASH" ] && [ "$BASH" != "/bin/sh" ]; then
+if [ "${PS1-}" ]; then
+  if [ "${BASH-}" ] && [ "$BASH" != "/bin/sh" ]; then
      # The file bash.bashrc already sets the default PS1.
      # PS1='\h:\w\$ '
      if [ -f /etc/bash.bashrc ]; then
diff --git a/rcS.d/S01alsa-utils b/rcS.d/S01alsa-utils

new file mode 120000 (symlink)

index 0000000..c5d8f77
--- /dev/null
+++ b/rcS.d/S01alsa-utils
@@ -0,0 +1 @@
+../init.d/alsa-utils
+\ No newline at end of file
diff --git a/rcS.d/S01apparmor b/rcS.d/S01apparmor

new file mode 120000 (symlink)

index 0000000..3c32f10
--- /dev/null
+++ b/rcS.d/S01apparmor
@@ -0,0 +1 @@
+../init.d/apparmor
+\ No newline at end of file
diff --git a/rcS.d/S01console-setup b/rcS.d/S01console-setup

deleted file mode 120000 (symlink)

index 28637af..0000000
--- a/rcS.d/S01console-setup
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/console-setup
-\ No newline at end of file
diff --git a/rcS.d/S01hostname.sh b/rcS.d/S01hostname.sh

new file mode 120000 (symlink)

index 0000000..d83dafc
--- /dev/null
+++ b/rcS.d/S01hostname.sh
@@ -0,0 +1 @@
+../init.d/hostname.sh
+\ No newline at end of file
diff --git a/rcS.d/S01lm-sensors b/rcS.d/S01lm-sensors

new file mode 120000 (symlink)

index 0000000..f0eb19a
--- /dev/null
+++ b/rcS.d/S01lm-sensors
@@ -0,0 +1 @@
+../init.d/lm-sensors
+\ No newline at end of file
diff --git a/rcS.d/S01mountkernfs.sh b/rcS.d/S01mountkernfs.sh

new file mode 120000 (symlink)

index 0000000..84ab86c
--- /dev/null
+++ b/rcS.d/S01mountkernfs.sh
@@ -0,0 +1 @@
+../init.d/mountkernfs.sh
+\ No newline at end of file
diff --git a/rcS.d/S01plymouth-log b/rcS.d/S01plymouth-log

new file mode 120000 (symlink)

index 0000000..afc914d
--- /dev/null
+++ b/rcS.d/S01plymouth-log
@@ -0,0 +1 @@
+../init.d/plymouth-log
+\ No newline at end of file
diff --git a/rcS.d/S01pppd-dns b/rcS.d/S01pppd-dns

new file mode 120000 (symlink)

index 0000000..01694cd
--- /dev/null
+++ b/rcS.d/S01pppd-dns
@@ -0,0 +1 @@
+../init.d/pppd-dns
+\ No newline at end of file
diff --git a/rcS.d/S01resolvconf b/rcS.d/S01resolvconf

new file mode 120000 (symlink)

index 0000000..dcf5e06
--- /dev/null
+++ b/rcS.d/S01resolvconf
@@ -0,0 +1 @@
+../init.d/resolvconf
+\ No newline at end of file
diff --git a/rcS.d/S01ufw b/rcS.d/S01ufw

new file mode 120000 (symlink)

index 0000000..958d443
--- /dev/null
+++ b/rcS.d/S01ufw
@@ -0,0 +1 @@
+../init.d/ufw
+\ No newline at end of file
diff --git a/rcS.d/S01virtualbox-guest-x11 b/rcS.d/S01virtualbox-guest-x11

new file mode 120000 (symlink)

index 0000000..fe5fe12
--- /dev/null
+++ b/rcS.d/S01virtualbox-guest-x11
@@ -0,0 +1 @@
+../init.d/virtualbox-guest-x11
+\ No newline at end of file
diff --git a/rcS.d/S01x11-common b/rcS.d/S01x11-common

new file mode 120000 (symlink)

index 0000000..b51f57c
--- /dev/null
+++ b/rcS.d/S01x11-common
@@ -0,0 +1 @@
+../init.d/x11-common
+\ No newline at end of file
diff --git a/rcS.d/S02alsa-utils b/rcS.d/S02alsa-utils

deleted file mode 120000 (symlink)

index c5d8f77..0000000
--- a/rcS.d/S02alsa-utils
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/alsa-utils
-\ No newline at end of file
diff --git a/rcS.d/S02apparmor b/rcS.d/S02apparmor

deleted file mode 120000 (symlink)

index 3c32f10..0000000
--- a/rcS.d/S02apparmor
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/apparmor
-\ No newline at end of file
diff --git a/rcS.d/S02hostname.sh b/rcS.d/S02hostname.sh

deleted file mode 120000 (symlink)

index d83dafc..0000000
--- a/rcS.d/S02hostname.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/hostname.sh
-\ No newline at end of file
diff --git a/rcS.d/S02lm-sensors b/rcS.d/S02lm-sensors

deleted file mode 120000 (symlink)

index f0eb19a..0000000
--- a/rcS.d/S02lm-sensors
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lm-sensors
-\ No newline at end of file
diff --git a/rcS.d/S02mountkernfs.sh b/rcS.d/S02mountkernfs.sh

deleted file mode 120000 (symlink)

index 84ab86c..0000000
--- a/rcS.d/S02mountkernfs.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mountkernfs.sh
-\ No newline at end of file
diff --git a/rcS.d/S02plymouth-log b/rcS.d/S02plymouth-log

deleted file mode 120000 (symlink)

index afc914d..0000000
--- a/rcS.d/S02plymouth-log
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/plymouth-log
-\ No newline at end of file
diff --git a/rcS.d/S02pppd-dns b/rcS.d/S02pppd-dns

deleted file mode 120000 (symlink)

index 01694cd..0000000
--- a/rcS.d/S02pppd-dns
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/pppd-dns
-\ No newline at end of file
diff --git a/rcS.d/S02resolvconf b/rcS.d/S02resolvconf

deleted file mode 120000 (symlink)

index dcf5e06..0000000
--- a/rcS.d/S02resolvconf
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/resolvconf
-\ No newline at end of file
diff --git a/rcS.d/S02udev b/rcS.d/S02udev

new file mode 120000 (symlink)

index 0000000..f5866f9
--- /dev/null
+++ b/rcS.d/S02udev
@@ -0,0 +1 @@
+../init.d/udev
+\ No newline at end of file
diff --git a/rcS.d/S02ufw b/rcS.d/S02ufw

deleted file mode 120000 (symlink)

index 958d443..0000000
--- a/rcS.d/S02ufw
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ufw
-\ No newline at end of file
diff --git a/rcS.d/S02virtualbox-guest-x11 b/rcS.d/S02virtualbox-guest-x11

deleted file mode 120000 (symlink)

index fe5fe12..0000000
--- a/rcS.d/S02virtualbox-guest-x11
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/virtualbox-guest-x11
-\ No newline at end of file
diff --git a/rcS.d/S02x11-common b/rcS.d/S02x11-common

deleted file mode 120000 (symlink)

index b51f57c..0000000
--- a/rcS.d/S02x11-common
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/x11-common
-\ No newline at end of file
diff --git a/rcS.d/S03brltty b/rcS.d/S03brltty

new file mode 120000 (symlink)

index 0000000..b9e48da
--- /dev/null
+++ b/rcS.d/S03brltty
@@ -0,0 +1 @@
+../init.d/brltty
+\ No newline at end of file
diff --git a/rcS.d/S03mountdevsubfs.sh b/rcS.d/S03mountdevsubfs.sh

new file mode 120000 (symlink)

index 0000000..bf53fdc
--- /dev/null
+++ b/rcS.d/S03mountdevsubfs.sh
@@ -0,0 +1 @@
+../init.d/mountdevsubfs.sh
+\ No newline at end of file
diff --git a/rcS.d/S03procps b/rcS.d/S03procps

new file mode 120000 (symlink)

index 0000000..435622f
--- /dev/null
+++ b/rcS.d/S03procps
@@ -0,0 +1 @@
+../init.d/procps
+\ No newline at end of file
diff --git a/rcS.d/S03udev b/rcS.d/S03udev

deleted file mode 120000 (symlink)

index f5866f9..0000000
--- a/rcS.d/S03udev
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/udev
-\ No newline at end of file
diff --git a/rcS.d/S04hwclock.sh b/rcS.d/S04hwclock.sh

new file mode 120000 (symlink)

index 0000000..c2b57ec
--- /dev/null
+++ b/rcS.d/S04hwclock.sh
@@ -0,0 +1 @@
+../init.d/hwclock.sh
+\ No newline at end of file
diff --git a/rcS.d/S04keyboard-setup b/rcS.d/S04keyboard-setup

deleted file mode 120000 (symlink)

index 356b56f..0000000
--- a/rcS.d/S04keyboard-setup
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/keyboard-setup
-\ No newline at end of file
diff --git a/rcS.d/S04lvm2 b/rcS.d/S04lvm2

new file mode 120000 (symlink)

index 0000000..155c707
--- /dev/null
+++ b/rcS.d/S04lvm2
@@ -0,0 +1 @@
+../init.d/lvm2
+\ No newline at end of file
diff --git a/rcS.d/S05brltty b/rcS.d/S05brltty

deleted file mode 120000 (symlink)

index b9e48da..0000000
--- a/rcS.d/S05brltty
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/brltty
-\ No newline at end of file
diff --git a/rcS.d/S05checkroot.sh b/rcS.d/S05checkroot.sh

new file mode 120000 (symlink)

index 0000000..79abfac
--- /dev/null
+++ b/rcS.d/S05checkroot.sh
@@ -0,0 +1 @@
+../init.d/checkroot.sh
+\ No newline at end of file
diff --git a/rcS.d/S05mountdevsubfs.sh b/rcS.d/S05mountdevsubfs.sh

deleted file mode 120000 (symlink)

index bf53fdc..0000000
--- a/rcS.d/S05mountdevsubfs.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mountdevsubfs.sh
-\ No newline at end of file
diff --git a/rcS.d/S05procps b/rcS.d/S05procps

deleted file mode 120000 (symlink)

index 435622f..0000000
--- a/rcS.d/S05procps
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/procps
-\ No newline at end of file
diff --git a/rcS.d/S06checkfs.sh b/rcS.d/S06checkfs.sh

new file mode 120000 (symlink)

index 0000000..1d95b78
--- /dev/null
+++ b/rcS.d/S06checkfs.sh
@@ -0,0 +1 @@
+../init.d/checkfs.sh
+\ No newline at end of file
diff --git a/rcS.d/S06hwclock.sh b/rcS.d/S06hwclock.sh

deleted file mode 120000 (symlink)

index c2b57ec..0000000
--- a/rcS.d/S06hwclock.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/hwclock.sh
-\ No newline at end of file
diff --git a/rcS.d/S06lvm2 b/rcS.d/S06lvm2

deleted file mode 120000 (symlink)

index 155c707..0000000
--- a/rcS.d/S06lvm2
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lvm2
-\ No newline at end of file
diff --git a/rcS.d/S07checkroot-bootclean.sh b/rcS.d/S07checkroot-bootclean.sh

new file mode 120000 (symlink)

index 0000000..e77f127
--- /dev/null
+++ b/rcS.d/S07checkroot-bootclean.sh
@@ -0,0 +1 @@
+../init.d/checkroot-bootclean.sh
+\ No newline at end of file
diff --git a/rcS.d/S07checkroot.sh b/rcS.d/S07checkroot.sh

deleted file mode 120000 (symlink)

index 79abfac..0000000
--- a/rcS.d/S07checkroot.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/checkroot.sh
-\ No newline at end of file
diff --git a/rcS.d/S07kmod b/rcS.d/S07kmod

new file mode 120000 (symlink)

index 0000000..6085cfe
--- /dev/null
+++ b/rcS.d/S07kmod
@@ -0,0 +1 @@
+../init.d/kmod
+\ No newline at end of file
diff --git a/rcS.d/S07urandom b/rcS.d/S07urandom

new file mode 120000 (symlink)

index 0000000..7f3aafd
--- /dev/null
+++ b/rcS.d/S07urandom
@@ -0,0 +1 @@
+../init.d/urandom
+\ No newline at end of file
diff --git a/rcS.d/S08checkfs.sh b/rcS.d/S08checkfs.sh

deleted file mode 120000 (symlink)

index 1d95b78..0000000
--- a/rcS.d/S08checkfs.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/checkfs.sh
-\ No newline at end of file
diff --git a/rcS.d/S08mountall.sh b/rcS.d/S08mountall.sh

new file mode 120000 (symlink)

index 0000000..63a9787
--- /dev/null
+++ b/rcS.d/S08mountall.sh
@@ -0,0 +1 @@
+../init.d/mountall.sh
+\ No newline at end of file
diff --git a/rcS.d/S08networking b/rcS.d/S08networking

new file mode 120000 (symlink)

index 0000000..bd5b2c2
--- /dev/null
+++ b/rcS.d/S08networking
@@ -0,0 +1 @@
+../init.d/networking
+\ No newline at end of file
diff --git a/rcS.d/S09checkroot-bootclean.sh b/rcS.d/S09checkroot-bootclean.sh

deleted file mode 120000 (symlink)

index e77f127..0000000
--- a/rcS.d/S09checkroot-bootclean.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/checkroot-bootclean.sh
-\ No newline at end of file
diff --git a/rcS.d/S09kmod b/rcS.d/S09kmod

deleted file mode 120000 (symlink)

index 6085cfe..0000000
--- a/rcS.d/S09kmod
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/kmod
-\ No newline at end of file
diff --git a/rcS.d/S09mountall-bootclean.sh b/rcS.d/S09mountall-bootclean.sh

new file mode 120000 (symlink)

index 0000000..49a3f45
--- /dev/null
+++ b/rcS.d/S09mountall-bootclean.sh
@@ -0,0 +1 @@
+../init.d/mountall-bootclean.sh
+\ No newline at end of file
diff --git a/rcS.d/S09rpcbind b/rcS.d/S09rpcbind

new file mode 120000 (symlink)

index 0000000..6c52e6f
--- /dev/null
+++ b/rcS.d/S09rpcbind
@@ -0,0 +1 @@
+../init.d/rpcbind
+\ No newline at end of file
diff --git a/rcS.d/S09urandom b/rcS.d/S09urandom

deleted file mode 120000 (symlink)

index 7f3aafd..0000000
--- a/rcS.d/S09urandom
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/urandom
-\ No newline at end of file
diff --git a/rcS.d/S10mountall.sh b/rcS.d/S10mountall.sh

deleted file mode 120000 (symlink)

index 63a9787..0000000
--- a/rcS.d/S10mountall.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mountall.sh
-\ No newline at end of file
diff --git a/rcS.d/S10mountnfs.sh b/rcS.d/S10mountnfs.sh

new file mode 120000 (symlink)

index 0000000..94b5f1f
--- /dev/null
+++ b/rcS.d/S10mountnfs.sh
@@ -0,0 +1 @@
+../init.d/mountnfs.sh
+\ No newline at end of file
diff --git a/rcS.d/S10networking b/rcS.d/S10networking

deleted file mode 120000 (symlink)

index bd5b2c2..0000000
--- a/rcS.d/S10networking
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/networking
-\ No newline at end of file
diff --git a/rcS.d/S11mountall-bootclean.sh b/rcS.d/S11mountall-bootclean.sh

deleted file mode 120000 (symlink)

index 49a3f45..0000000
--- a/rcS.d/S11mountall-bootclean.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mountall-bootclean.sh
-\ No newline at end of file
diff --git a/rcS.d/S11mountnfs-bootclean.sh b/rcS.d/S11mountnfs-bootclean.sh

new file mode 120000 (symlink)

index 0000000..432307e
--- /dev/null
+++ b/rcS.d/S11mountnfs-bootclean.sh
@@ -0,0 +1 @@
+../init.d/mountnfs-bootclean.sh
+\ No newline at end of file
diff --git a/rcS.d/S11rpcbind b/rcS.d/S11rpcbind

deleted file mode 120000 (symlink)

index 6c52e6f..0000000
--- a/rcS.d/S11rpcbind
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rpcbind
-\ No newline at end of file
diff --git a/rcS.d/S12bootmisc.sh b/rcS.d/S12bootmisc.sh

new file mode 120000 (symlink)

index 0000000..1ab1097
--- /dev/null
+++ b/rcS.d/S12bootmisc.sh
@@ -0,0 +1 @@
+../init.d/bootmisc.sh
+\ No newline at end of file
diff --git a/rcS.d/S12mountnfs.sh b/rcS.d/S12mountnfs.sh

deleted file mode 120000 (symlink)

index 94b5f1f..0000000
--- a/rcS.d/S12mountnfs.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mountnfs.sh
-\ No newline at end of file
diff --git a/rcS.d/S13mountnfs-bootclean.sh b/rcS.d/S13mountnfs-bootclean.sh

deleted file mode 120000 (symlink)

index 432307e..0000000
--- a/rcS.d/S13mountnfs-bootclean.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mountnfs-bootclean.sh
-\ No newline at end of file
diff --git a/rcS.d/S14bootmisc.sh b/rcS.d/S14bootmisc.sh

deleted file mode 120000 (symlink)

index 1ab1097..0000000
--- a/rcS.d/S14bootmisc.sh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/bootmisc.sh
-\ No newline at end of file
diff --git a/securetty b/securetty

index 623ebf013fa56af57163af338c304332bbb149cd..2e346381199e86a3d97306f0124017e158f82b66 100644 (file)
--- a/securetty
+++ b/securetty
@@ -211,6 +211,12 @@ ttySC0
  ttySC1
  ttySC2
  ttySC3
+ttySC4
+ttySC5
+ttySC6
+ttySC7
+ttySC8
+ttySC9
  
  # ARM "AMBA" serial ports
  ttyAM0
@@ -398,3 +404,9 @@ duart1
  
  # s390 and s390x ports in LPAR mode
  ttysclp0
+
+# ODROID XU4 serial console
+ttySAC0
+ttySAC1
+ttySAC2
+ttySAC3
diff --git a/security/namespace.init b/security/namespace.init

index 9ab58062fa378575f75f5a8c27293c9724361b69..67d4aa2d213a145edc2359b410cc0ba174057a7f 100755 (executable)
--- a/security/namespace.init
+++ b/security/namespace.init
@@ -1,4 +1,4 @@
-#!/bin/sh -p
+#!/bin/sh
  # It receives polydir path as $1, the instance path as $2,
  # a flag whether the instance dir was newly created (0 - no, 1 - yes) in $3,
  # and user name in $4.
diff --git a/selinux/semanage.conf b/selinux/semanage.conf

index 1c80950a28030e9659cf38ca523bcf9e2066493e..5133998b163abd819bc7b32e2f90be7efefbabe7 100644 (file)
--- a/selinux/semanage.conf
+++ b/selinux/semanage.conf
@@ -39,3 +39,7 @@ module-store = direct
  # expand-check check neverallow rules when executing all semanage commands.
  # Large penalty in time if you turn this on.
  expand-check=0
+
+# By default, semanage will generate policies for the SELinux target.
+# To build policies for Xen, uncomment the following line.
+#target-platform = xen
diff --git a/skel/.bashrc b/skel/.bashrc

index 9fdf896df97d3d60ca5e85063c5e622e44e641a9..b488fcc4cee656840d7a756298456eaa243b3e46 100644 (file)
--- a/skel/.bashrc
+++ b/skel/.bashrc
@@ -37,7 +37,7 @@ fi
  
  # set a fancy prompt (non-color, unless we know we "want" color)
  case "$TERM" in
-    xterm|xterm-color|*-256color) color_prompt=yes;;
+    xterm-color|*-256color) color_prompt=yes;;
  esac
  
  # uncomment for a colored prompt, if the terminal has the capability; turned
@@ -57,20 +57,16 @@ if [ -n "$force_color_prompt" ]; then
  fi
  
  if [ "$color_prompt" = yes ]; then
-    if [[ ${EUID} == 0 ]] ; then
-        PS1='${debian_chroot:+($debian_chroot)}\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] '
-    else
-        PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\] \[\033[01;34m\]\w \$\[\033[00m\] '
-    fi
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
  else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h \w \$ '
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
  fi
  unset color_prompt force_color_prompt
  
  # If this is an xterm set the title to user@host:dir
  case "$TERM" in
  xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h \w\a\]$PS1"
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
      ;;
  *)
      ;;
@@ -119,7 +115,3 @@ if ! shopt -oq posix; then
      . /etc/bash_completion
    fi
  fi
-
-if [ -x /usr/bin/mint-fortune ]; then
-     /usr/bin/mint-fortune
-fi
diff --git a/skel/.profile b/skel/.profile

index 565d704ed2fe553a9df7929e705d5da7dfd6ded0..d89ea5a6e83a2956d7461b547fa0d7d68103b9c9 100644 (file)
--- a/skel/.profile
+++ b/skel/.profile
@@ -16,5 +16,12 @@ if [ -n "$BASH_VERSION" ]; then
      fi
  fi
  
-# set PATH so it includes user's private bin directories
-PATH="$HOME/bin:$HOME/.local/bin:$PATH"
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/bin" ] ; then
+    PATH="$HOME/bin:$PATH"
+fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
diff --git a/systemd/system/timers.target.wants/motd-news.timer b/systemd/system/timers.target.wants/motd-news.timer

new file mode 120000 (symlink)

index 0000000..b5cf829
--- /dev/null
+++ b/systemd/system/timers.target.wants/motd-news.timer
@@ -0,0 +1 @@
+/lib/systemd/system/motd-news.timer
+\ No newline at end of file
diff --git a/update-motd.d/00-header b/update-motd.d/00-header

index 5ef9c4f6f7a696b38456a9c4ff113fb9d966d6da..1a2485251c33a70432394c93fb89330ef214bfc9 100755 (executable)
--- a/update-motd.d/00-header
+++ b/update-motd.d/00-header
@@ -1,29 +1 @@
  #!/bin/sh
-#
-#    00-header - create the header of the MOTD
-#    Copyright (C) 2009-2010 Canonical Ltd.
-#
-#    Authors: Dustin Kirkland <kirkland@canonical.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.
-#
-#    You should have received a copy of the GNU General Public License along
-#    with this program; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-[ -r /etc/lsb-release ] && . /etc/lsb-release
-
-if [ -z "$DISTRIB_DESCRIPTION" ] && [ -x /usr/bin/lsb_release ]; then
-       # Fall back to using the very slow lsb_release utility
-       DISTRIB_DESCRIPTION=$(lsb_release -s -d)
-fi
-
-printf "Welcome to %s (%s %s %s)\n" "$DISTRIB_DESCRIPTION" "$(uname -o)" "$(uname -r)" "$(uname -m)"
diff --git a/update-motd.d/10-help-text b/update-motd.d/10-help-text

index f8cd038c9a123d6195496036536619ea2b43af97..1a2485251c33a70432394c93fb89330ef214bfc9 100755 (executable)
--- a/update-motd.d/10-help-text
+++ b/update-motd.d/10-help-text
@@ -1,6 +1 @@
  #!/bin/sh
-
-echo
-echo "Welcome to Linux Mint"
-echo " * Documentation:  http://www.linuxmint.com"
-
diff --git a/update-motd.d/50-motd-news b/update-motd.d/50-motd-news

new file mode 100755 (executable)

index 0000000..1a24852
--- /dev/null
+++ b/update-motd.d/50-motd-news
@@ -0,0 +1 @@
+#!/bin/sh
author	mhoellein <mhoellein@homeserver.homeip.net>
	Tue, 23 Oct 2018 21:28:45 +0000 (23:28 +0200)
committer	root <root@homeserver.homeip.net>
	Tue, 23 Oct 2018 21:28:45 +0000 (23:28 +0200)
.etckeeper		patch \| blob \| history
X11/Xsession.d/00upstart	[deleted file]	patch \| blob \| history
X11/Xsession.d/60x11-common_xdg_path		patch \| blob \| history
X11/Xsession.d/99upstart	[deleted file]	patch \| blob \| history
apt/trusted.gpg		patch \| blob \| history
apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg	[new file with mode: 0644]	patch \| blob
apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg	[new file with mode: 0644]	patch \| blob
bash.bashrc		patch \| blob \| history
debian_version		patch \| blob \| history
default/motd-news	[new file with mode: 0644]	patch \| blob
fonts/conf.avail/10-antialias.conf		patch \| blob \| history
fonts/conf.avail/10-hinting-full.conf		patch \| blob \| history
fonts/conf.avail/10-hinting-medium.conf		patch \| blob \| history
fonts/conf.avail/10-hinting-none.conf	[new file with mode: 0644]	patch \| blob
fonts/conf.avail/10-hinting-slight.conf		patch \| blob \| history
fonts/conf.avail/30-metric-aliases.conf		patch \| blob \| history
fonts/conf.avail/40-nonlatin.conf		patch \| blob \| history
fonts/conf.avail/45-generic.conf	[new file with mode: 0644]	patch \| blob
fonts/conf.avail/45-latin.conf		patch \| blob \| history
fonts/conf.avail/53-monospace-lcd-filter.conf		patch \| blob \| history
fonts/conf.avail/60-generic.conf	[new file with mode: 0644]	patch \| blob
fonts/conf.avail/60-latin.conf		patch \| blob \| history
fonts/conf.avail/65-nonlatin.conf		patch \| blob \| history
fonts/conf.d/10-hinting.conf	[deleted symlink]	patch \| blob \| history
fonts/conf.d/30-urw-aliases.conf	[deleted symlink]	patch \| blob \| history
fonts/conf.d/45-generic.conf	[new symlink]	patch \| blob
fonts/conf.d/60-generic.conf	[new symlink]	patch \| blob
fonts/conf.d/69-language-selector-ja.conf	[new symlink]	patch \| blob
fonts/fonts.conf		patch \| blob \| history
init.d/console-setup	[deleted file]	patch \| blob \| history
init.d/keyboard-setup	[deleted file]	patch \| blob \| history
init/apparmor.conf	[deleted file]	patch \| blob \| history
init/console-font.conf	[deleted file]	patch \| blob \| history
init/console-setup.conf	[deleted file]	patch \| blob \| history
init/cron.conf	[deleted file]	patch \| blob \| history
init/dbus.conf	[deleted file]	patch \| blob \| history
init/kmod.conf	[deleted file]	patch \| blob \| history
init/passwd.conf	[deleted file]	patch \| blob \| history
init/setvtrgb.conf	[deleted file]	patch \| blob \| history
issue		patch \| blob \| history
issue.net		patch \| blob \| history
kbd/config	[deleted file]	patch \| blob \| history
kbd/remap	[deleted file]	patch \| blob \| history
ld.so.conf.d/i386-linux-gnu.conf		patch \| blob \| history
ld.so.conf.d/x86_64-linux-gnu.conf		patch \| blob \| history
legal		patch \| blob \| history
login.defs		patch \| blob \| history
lsb-release		patch \| blob \| history
mime.types		patch \| blob \| history
modprobe.d/mlx4.conf	[deleted file]	patch \| blob \| history
pam.d/common-auth		patch \| blob \| history
pam.d/login		patch \| blob \| history
profile		patch \| blob \| history
rcS.d/S01alsa-utils	[new symlink]	patch \| blob
rcS.d/S01apparmor	[new symlink]	patch \| blob
rcS.d/S01console-setup	[deleted symlink]	patch \| blob \| history
rcS.d/S01hostname.sh	[new symlink]	patch \| blob
rcS.d/S01lm-sensors	[new symlink]	patch \| blob
rcS.d/S01mountkernfs.sh	[new symlink]	patch \| blob
rcS.d/S01plymouth-log	[new symlink]	patch \| blob
rcS.d/S01pppd-dns	[new symlink]	patch \| blob
rcS.d/S01resolvconf	[new symlink]	patch \| blob
rcS.d/S01ufw	[new symlink]	patch \| blob
rcS.d/S01virtualbox-guest-x11	[new symlink]	patch \| blob
rcS.d/S01x11-common	[new symlink]	patch \| blob
rcS.d/S02alsa-utils	[deleted symlink]	patch \| blob \| history
rcS.d/S02apparmor	[deleted symlink]	patch \| blob \| history
rcS.d/S02hostname.sh	[deleted symlink]	patch \| blob \| history
rcS.d/S02lm-sensors	[deleted symlink]	patch \| blob \| history
rcS.d/S02mountkernfs.sh	[deleted symlink]	patch \| blob \| history
rcS.d/S02plymouth-log	[deleted symlink]	patch \| blob \| history
rcS.d/S02pppd-dns	[deleted symlink]	patch \| blob \| history
rcS.d/S02resolvconf	[deleted symlink]	patch \| blob \| history
rcS.d/S02udev	[new symlink]	patch \| blob
rcS.d/S02ufw	[deleted symlink]	patch \| blob \| history
rcS.d/S02virtualbox-guest-x11	[deleted symlink]	patch \| blob \| history
rcS.d/S02x11-common	[deleted symlink]	patch \| blob \| history
rcS.d/S03brltty	[new symlink]	patch \| blob
rcS.d/S03mountdevsubfs.sh	[new symlink]	patch \| blob
rcS.d/S03procps	[new symlink]	patch \| blob
rcS.d/S03udev	[deleted symlink]	patch \| blob \| history
rcS.d/S04hwclock.sh	[new symlink]	patch \| blob
rcS.d/S04keyboard-setup	[deleted symlink]	patch \| blob \| history
rcS.d/S04lvm2	[new symlink]	patch \| blob
rcS.d/S05brltty	[deleted symlink]	patch \| blob \| history
rcS.d/S05checkroot.sh	[new symlink]	patch \| blob
rcS.d/S05mountdevsubfs.sh	[deleted symlink]	patch \| blob \| history
rcS.d/S05procps	[deleted symlink]	patch \| blob \| history
rcS.d/S06checkfs.sh	[new symlink]	patch \| blob
rcS.d/S06hwclock.sh	[deleted symlink]	patch \| blob \| history
rcS.d/S06lvm2	[deleted symlink]	patch \| blob \| history
rcS.d/S07checkroot-bootclean.sh	[new symlink]	patch \| blob
rcS.d/S07checkroot.sh	[deleted symlink]	patch \| blob \| history
rcS.d/S07kmod	[new symlink]	patch \| blob
rcS.d/S07urandom	[new symlink]	patch \| blob
rcS.d/S08checkfs.sh	[deleted symlink]	patch \| blob \| history
rcS.d/S08mountall.sh	[new symlink]	patch \| blob
rcS.d/S08networking	[new symlink]	patch \| blob
rcS.d/S09checkroot-bootclean.sh	[deleted symlink]	patch \| blob \| history
rcS.d/S09kmod	[deleted symlink]	patch \| blob \| history
rcS.d/S09mountall-bootclean.sh	[new symlink]	patch \| blob
rcS.d/S09rpcbind	[new symlink]	patch \| blob
rcS.d/S09urandom	[deleted symlink]	patch \| blob \| history
rcS.d/S10mountall.sh	[deleted symlink]	patch \| blob \| history
rcS.d/S10mountnfs.sh	[new symlink]	patch \| blob
rcS.d/S10networking	[deleted symlink]	patch \| blob \| history
rcS.d/S11mountall-bootclean.sh	[deleted symlink]	patch \| blob \| history
rcS.d/S11mountnfs-bootclean.sh	[new symlink]	patch \| blob
rcS.d/S11rpcbind	[deleted symlink]	patch \| blob \| history
rcS.d/S12bootmisc.sh	[new symlink]	patch \| blob
rcS.d/S12mountnfs.sh	[deleted symlink]	patch \| blob \| history
rcS.d/S13mountnfs-bootclean.sh	[deleted symlink]	patch \| blob \| history
rcS.d/S14bootmisc.sh	[deleted symlink]	patch \| blob \| history
securetty		patch \| blob \| history
security/namespace.init		patch \| blob \| history
selinux/semanage.conf		patch \| blob \| history
skel/.bashrc		patch \| blob \| history
skel/.profile		patch \| blob \| history
systemd/system/timers.target.wants/motd-news.timer	[new symlink]	patch \| blob
update-motd.d/00-header		patch \| blob \| history
update-motd.d/10-help-text		patch \| blob \| history
update-motd.d/50-motd-news	[new file with mode: 0755]	patch \| blob