committing changes in /etc after apt run

author root <root@localhost>

Fri, 24 Aug 2018 13:24:22 +0000 (15:24 +0200)

committer root <root@localhost>

Fri, 24 Aug 2018 13:24:22 +0000 (15:24 +0200)
author root <root@localhost>
Fri, 24 Aug 2018 13:24:22 +0000 (15:24 +0200)
committer root <root@localhost>
Fri, 24 Aug 2018 13:24:22 +0000 (15:24 +0200)
diff --git a/.etckeeper b/.etckeeper

index c29d2e8a7ba120b23b685ff913d5f7374c6a7f35..1be803939e1e3a65176eb58ad48b2050699d40cc 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -10,6 +10,7 @@ mkdir -p './X11/xkb'
  mkdir -p './apparmor.d/force-complain'
  mkdir -p './apparmor.d/tunables/multiarch.d'
  mkdir -p './apt/preferences.d'
+mkdir -p './at-spi2'
  mkdir -p './avahi/services'
  mkdir -p './binfmt.d'
  mkdir -p './brltty/Input/xw'
@@ -52,7 +53,6 @@ mkdir -p './security/limits.d'
  mkdir -p './security/namespace.d'
  mkdir -p './systemd/network'
  mkdir -p './systemd/user'
-mkdir -p './tmpfiles.d'
  mkdir -p './udev/hwdb.d'
  mkdir -p './udisks2'
  mkdir -p './update-manager/release-upgrades.d'
@@ -154,7 +154,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'
@@ -165,7 +164,6 @@ maybe chmod 0644 'X11/Xsession.d/55gnome-session_gnomerc'
  maybe chmod 0644 'X11/Xsession.d/60x11-common_localhost'
  maybe chmod 0644 'X11/Xsession.d/60x11-common_xdg_path'
  maybe chmod 0644 'X11/Xsession.d/60xbrlapi'
-maybe chmod 0644 'X11/Xsession.d/60xdg-user-dirs-update'
  maybe chmod 0644 'X11/Xsession.d/65compiz_profile-on-session'
  maybe chmod 0644 'X11/Xsession.d/65snappy'
  maybe chmod 0644 'X11/Xsession.d/70gconfd_path-on-session'
@@ -177,9 +175,9 @@ maybe chmod 0644 'X11/Xsession.d/90gpg-agent'
  maybe chmod 0644 'X11/Xsession.d/90qt-a11y'
  maybe chmod 0644 'X11/Xsession.d/90x11-common_ssh-agent'
  maybe chmod 0644 'X11/Xsession.d/95dbus_update-activation-env'
-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/XvMCConfig'
  maybe chmod 0644 'X11/Xwrapper.config'
  maybe chmod 0755 'X11/app-defaults'
  maybe chmod 0644 'X11/app-defaults/Bitmap'
@@ -260,11 +258,9 @@ maybe chmod 0644 'acpi/events/asus-wireless-off'
  maybe chmod 0644 'acpi/events/asus-wireless-on'
  maybe chmod 0644 'acpi/events/ibm-wireless'
  maybe chmod 0644 'acpi/events/lenovo-undock'
-maybe chmod 0644 'acpi/events/powerbtn'
  maybe chmod 0644 'acpi/events/thinkpad-cmos'
  maybe chmod 0644 'acpi/events/tosh-wireless'
  maybe chmod 0755 'acpi/ibm-wireless.sh'
-maybe chmod 0755 'acpi/powerbtn.sh'
  maybe chmod 0755 'acpi/tosh-wireless.sh'
  maybe chmod 0755 'acpi/undock.sh'
  maybe chmod 0644 'adduser.conf'
@@ -465,6 +461,7 @@ maybe chmod 0644 'apt/apt.conf.d/20archive'
  maybe chmod 0644 'apt/apt.conf.d/20auto-upgrades'
  maybe chmod 0644 'apt/apt.conf.d/20dbus'
  maybe chmod 0644 'apt/apt.conf.d/50appstream'
+maybe chmod 0644 'apt/apt.conf.d/50command-not-found'
  maybe chmod 0644 'apt/apt.conf.d/50unattended-upgrades'
  maybe chmod 0644 'apt/apt.conf.d/70debconf'
  maybe chmod 0644 'apt/apt.conf.d/99update-notifier'
@@ -525,13 +522,14 @@ maybe chmod 0644 'apt/trusted.gpg.d/graphics-drivers_ubuntu_ppa.gpg'
  maybe chmod 0644 'apt/trusted.gpg.d/linphone_ubuntu_release.gpg'
  maybe chmod 0644 'apt/trusted.gpg.d/mozillateam_ubuntu_firefox-next.gpg'
  maybe chmod 0644 'apt/trusted.gpg.d/privacyidea_ubuntu_privacyidea-dev.gpg'
+maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg'
+maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg'
  maybe chmod 0644 'apt/trusted.gpg.d/webupd8team_ubuntu_java.gpg'
  maybe chmod 0644 'apt/trusted.gpg.d/yubico_ubuntu_stable.gpg'
  maybe chmod 0755 'aptdaemon'
  maybe chmod 0755 'aptdaemon/high-trust-repository-whitelist.d'
  maybe chmod 0644 'aptdaemon/high-trust-repository-whitelist.d/aptdaemon-trust-webapps.cfg'
  maybe chmod 0755 'at-spi2'
-maybe chmod 0644 'at-spi2/accessibility.conf'
  maybe chmod 0755 'avahi'
  maybe chmod 0755 'avahi/avahi-autoipd.action'
  maybe chmod 0644 'avahi/avahi-daemon.conf'
@@ -542,7 +540,6 @@ maybe chmod 0644 'bash.bashrc'
  maybe chmod 0644 'bash_completion'
  maybe chmod 0755 'bash_completion.d'
  maybe chmod 0644 'bash_completion.d/apport_completion'
-maybe chmod 0644 'bash_completion.d/cryptdisks'
  maybe chmod 0644 'bash_completion.d/desktop-file-validate'
  maybe chmod 0644 'bash_completion.d/dkms'
  maybe chmod 0644 'bash_completion.d/git-prompt'
@@ -1008,6 +1005,10 @@ maybe chmod 0755 'console-setup'
  maybe chmod 0644 'console-setup/ISO-8859-1.acm'
  maybe chmod 0644 'console-setup/Uni2-Fixed16.psf.gz'
  maybe chmod 0644 'console-setup/cached.kmap.gz'
+maybe chmod 0644 'console-setup/cached_UTF-8_del.kmap.gz'
+maybe chmod 0755 'console-setup/cached_setup_font.sh'
+maybe chmod 0755 'console-setup/cached_setup_keyboard.sh'
+maybe chmod 0755 'console-setup/cached_setup_terminal.sh'
  maybe chmod 0644 'console-setup/compose.ARMSCII-8.inc'
  maybe chmod 0644 'console-setup/compose.CP1251.inc'
  maybe chmod 0644 'console-setup/compose.CP1255.inc'
@@ -1070,7 +1071,6 @@ maybe chmod 0644 'cron.hourly/.placeholder'
  maybe chmod 0755 'cron.monthly'
  maybe chmod 0644 'cron.monthly/.placeholder'
  maybe chmod 0755 'cron.monthly/0anacron'
-maybe chmod 0755 'cron.monthly/ieee-data'
  maybe chmod 0755 'cron.monthly/rsnapshot'
  maybe chmod 0755 'cron.weekly'
  maybe chmod 0644 'cron.weekly/.placeholder'
@@ -1083,6 +1083,8 @@ maybe chmod 0644 'crontab'
  maybe chmod 0755 'cruft'
  maybe chmod 0755 'cruft/filters-unex'
  maybe chmod 0644 'cruft/filters-unex/etckeeper'
+maybe chmod 0755 'cryptsetup-initramfs'
+maybe chmod 0644 'cryptsetup-initramfs/conf-hook'
  maybe chmod 0664 'crypttab'
  maybe chgrp 'lp' 'cups'
  maybe chmod 0755 'cups'
@@ -1203,6 +1205,7 @@ maybe chmod 0644 'default/irqbalance'
  maybe chmod 0644 'default/kerneloops'
  maybe chmod 0664 'default/keyboard'
  maybe chmod 0644 'default/locale'
+maybe chmod 0644 'default/motd-news'
  maybe chmod 0644 'default/networking'
  maybe chmod 0644 'default/nss'
  maybe chmod 0644 'default/openvpn'
@@ -1232,6 +1235,15 @@ maybe chmod 0755 'dictionaries-common'
  maybe chmod 0644 'dictionaries-common/ispell-default'
  maybe chmod 0755 'dkms'
  maybe chmod 0644 'dkms/framework.conf'
+maybe chmod 0755 'dkms/template-dkms-mkbmdeb'
+maybe chmod 0644 'dkms/template-dkms-mkbmdeb/Makefile'
+maybe chmod 0755 'dkms/template-dkms-mkbmdeb/debian'
+maybe chmod 0644 'dkms/template-dkms-mkbmdeb/debian/README.Debian'
+maybe chmod 0644 'dkms/template-dkms-mkbmdeb/debian/changelog'
+maybe chmod 0644 'dkms/template-dkms-mkbmdeb/debian/compat'
+maybe chmod 0644 'dkms/template-dkms-mkbmdeb/debian/control'
+maybe chmod 0644 'dkms/template-dkms-mkbmdeb/debian/copyright'
+maybe chmod 0755 'dkms/template-dkms-mkbmdeb/debian/rules'
  maybe chmod 0755 'dkms/template-dkms-mkdeb'
  maybe chmod 0644 'dkms/template-dkms-mkdeb/Makefile'
  maybe chmod 0755 'dkms/template-dkms-mkdeb/debian'
@@ -1280,6 +1292,7 @@ maybe chmod 0755 'etckeeper/commit.d/30hg-addremove'
  maybe chmod 0755 'etckeeper/commit.d/50vcs-commit'
  maybe chmod 0755 'etckeeper/commit.d/99push'
  maybe chmod 0644 'etckeeper/commit.d/README'
+maybe chmod 0755 'etckeeper/daily'
  maybe chmod 0644 'etckeeper/etckeeper.conf'
  maybe chmod 0755 'etckeeper/init.d'
  maybe chmod 0755 'etckeeper/init.d/10restore-metadata'
@@ -1334,6 +1347,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'
@@ -1357,8 +1371,8 @@ maybe chmod 0644 'fonts/conf.avail/25-unhint-nonlatin.conf'
  maybe chmod 0644 'fonts/conf.avail/30-cjk-aliases.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/31-cantarell.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'
@@ -1370,25 +1384,17 @@ 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'
-maybe chmod 0644 'fonts/conf.avail/64-11-tlwg-waree.conf'
-maybe chmod 0644 'fonts/conf.avail/64-12-tlwg-loma.conf'
-maybe chmod 0644 'fonts/conf.avail/64-13-tlwg-garuda.conf'
-maybe chmod 0644 'fonts/conf.avail/64-14-tlwg-umpush.conf'
-maybe chmod 0644 'fonts/conf.avail/64-15-laksaman.conf'
-maybe chmod 0644 'fonts/conf.avail/64-21-tlwg-typo.conf'
-maybe chmod 0644 'fonts/conf.avail/64-22-tlwg-typist.conf'
-maybe chmod 0644 'fonts/conf.avail/64-23-tlwg-mono.conf'
  maybe chmod 0644 'fonts/conf.avail/64-language-selector-prefer.conf'
-maybe chmod 0755 'fonts/conf.avail/65-0-fonts-guru-extra.conf'
-maybe chmod 0644 'fonts/conf.avail/65-0-fonts-guru-extra.conf/65-0-fonts-guru-extra.conf'
+maybe chmod 0644 'fonts/conf.avail/65-0-fonts-guru-extra.conf'
  maybe chmod 0644 'fonts/conf.avail/65-fonts-persian.conf'
  maybe chmod 0644 'fonts/conf.avail/65-fonts-takao-pgothic.conf'
  maybe chmod 0644 'fonts/conf.avail/65-khmer.conf'
  maybe chmod 0644 'fonts/conf.avail/65-nonlatin.conf'
+maybe chmod 0644 'fonts/conf.avail/66-lohit-gurmukhi.conf'
  maybe chmod 0644 'fonts/conf.avail/66-lohit-punjabi.conf'
+maybe chmod 0644 'fonts/conf.avail/69-language-selector-ja.conf'
  maybe chmod 0644 'fonts/conf.avail/69-language-selector-zh-cn.conf'
  maybe chmod 0644 'fonts/conf.avail/69-language-selector-zh-hk.conf'
  maybe chmod 0644 'fonts/conf.avail/69-language-selector-zh-mo.conf'
@@ -1399,12 +1405,6 @@ maybe chmod 0644 'fonts/conf.avail/70-force-bitmaps.conf'
  maybe chmod 0644 'fonts/conf.avail/70-no-bitmaps.conf'
  maybe chmod 0644 'fonts/conf.avail/70-yes-bitmaps.conf'
  maybe chmod 0644 'fonts/conf.avail/80-delicious.conf'
-maybe chmod 0644 'fonts/conf.avail/89-tlwg-garuda-synthetic.conf'
-maybe chmod 0644 'fonts/conf.avail/89-tlwg-kinnari-synthetic.conf'
-maybe chmod 0644 'fonts/conf.avail/89-tlwg-laksaman-synthetic.conf'
-maybe chmod 0644 'fonts/conf.avail/89-tlwg-loma-synthetic.conf'
-maybe chmod 0644 'fonts/conf.avail/89-tlwg-umpush-synthetic.conf'
-maybe chmod 0644 'fonts/conf.avail/89-tlwg-waree-synthetic.conf'
  maybe chmod 0644 'fonts/conf.avail/90-synthetic.conf'
  maybe chmod 0644 'fonts/conf.avail/99-language-selector-zh.conf'
  maybe chmod 0755 'fonts/conf.d'
@@ -1530,7 +1530,7 @@ maybe chmod 0755 'init.d/brltty'
  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/console-setup.sh'
  maybe chmod 0755 'init.d/cron'
  maybe chmod 0755 'init.d/cryptdisks'
  maybe chmod 0755 'init.d/cryptdisks-early'
@@ -1547,6 +1547,7 @@ maybe chmod 0755 'init.d/hostname.sh'
  maybe chmod 0755 'init.d/hwclock.sh'
  maybe chmod 0755 'init.d/irqbalance'
  maybe chmod 0755 'init.d/kerneloops'
+maybe chmod 0755 'init.d/keyboard-setup.sh'
  maybe chmod 0755 'init.d/killprocs'
  maybe chmod 0755 'init.d/kmod'
  maybe chmod 0755 'init.d/lightdm'
@@ -1596,7 +1597,6 @@ maybe chmod 0755 'init.d/urandom'
  maybe chmod 0755 'init.d/uuidd'
  maybe chmod 0755 'init.d/whoopsie'
  maybe chmod 0755 'init.d/x11-common'
-maybe chmod 0644 'init/acpid.conf'
  maybe chmod 0644 'init/alsa-utils.conf'
  maybe chmod 0644 'init/anacron.conf'
  maybe chmod 0644 'init/apparmor.conf'
@@ -1608,21 +1608,14 @@ maybe chmod 0644 'init/bootmisc.sh.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/cryptdisks-udev.conf'
-maybe chmod 0644 'init/cryptdisks.conf'
  maybe chmod 0644 'init/cups-browsed.conf'
  maybe chmod 0644 'init/cups.conf'
-maybe chmod 0644 'init/dbus.conf'
  maybe chmod 0644 'init/failsafe-x.conf'
  maybe chmod 0644 'init/failsafe.conf'
  maybe chmod 0644 'init/flush-early-job-log.conf'
-maybe chmod 0644 'init/friendly-recovery.conf'
  maybe chmod 0644 'init/gdm3.conf'
  maybe chmod 0644 'init/gpu-manager.conf'
  maybe chmod 0644 'init/hostname.conf'
@@ -1630,8 +1623,6 @@ maybe chmod 0644 'init/hostname.sh.conf'
  maybe chmod 0644 'init/hwclock-save.conf'
  maybe chmod 0644 'init/hwclock.conf'
  maybe chmod 0644 'init/hwclock.sh.conf'
-maybe chmod 0644 'init/irqbalance.conf'
-maybe chmod 0644 'init/kmod.conf'
  maybe chmod 0644 'init/lightdm.conf'
  maybe chmod 0644 'init/mongodb.conf'
  maybe chmod 0644 'init/mountall-bootclean.sh.conf'
@@ -1651,24 +1642,15 @@ maybe chmod 0644 'init/mountkernfs.sh.conf'
  maybe chmod 0644 'init/mountnfs-bootclean.sh.conf'
  maybe chmod 0644 'init/mountnfs.sh.conf'
  maybe chmod 0644 'init/mtab.sh.conf'
-maybe chmod 0644 'init/network-interface-container.conf'
-maybe chmod 0644 'init/network-interface-security.conf'
-maybe chmod 0644 'init/network-interface.conf'
  maybe chmod 0644 'init/network-manager.conf'
-maybe chmod 0644 'init/networking.conf'
  maybe chmod 0644 'init/nvidia-prime.conf'
  maybe chmod 0644 'init/oem-config.conf'
-maybe chmod 0644 'init/passwd.conf'
  maybe chmod 0644 'init/procps-instance.conf'
  maybe chmod 0644 'init/procps.conf'
  maybe chmod 0644 'init/rc-sysinit.conf'
  maybe chmod 0644 'init/rc.conf'
  maybe chmod 0644 'init/rcS.conf'
-maybe chmod 0644 'init/resolvconf.conf'
-maybe chmod 0644 'init/rfkill-restore.conf'
-maybe chmod 0644 'init/rfkill-store.conf'
  maybe chmod 0644 'init/rsyslog.conf'
-maybe chmod 0644 'init/setvtrgb.conf'
  maybe chmod 0644 'init/shutdown.conf'
  maybe chmod 0644 'init/ssh.conf'
  maybe chmod 0644 'init/thermald.conf'
@@ -1682,12 +1664,9 @@ maybe chmod 0644 'init/ubiquity.conf'
  maybe chmod 0644 'init/udev.conf'
  maybe chmod 0644 'init/udevmonitor.conf'
  maybe chmod 0644 'init/udevtrigger.conf'
-maybe chmod 0644 'init/ufw.conf'
  maybe chmod 0644 'init/upstart-file-bridge.conf'
  maybe chmod 0644 'init/upstart-socket-bridge.conf'
  maybe chmod 0644 'init/upstart-udev-bridge.conf'
-maybe chmod 0644 'init/ureadahead-other.conf'
-maybe chmod 0644 'init/ureadahead.conf'
  maybe chmod 0644 'init/usb-modeswitch-upstart.conf'
  maybe chmod 0644 'init/wait-for-state.conf'
  maybe chmod 0644 'init/whoopsie.conf'
@@ -1750,9 +1729,6 @@ maybe chmod 0755 'john'
  maybe chmod 0644 'john/john-mail.conf'
  maybe chmod 0644 'john/john-mail.msg'
  maybe chmod 0644 'john/john.conf'
-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'
@@ -1837,6 +1813,15 @@ maybe chmod 0700 'lvm/archive'
  maybe chmod 0700 'lvm/backup'
  maybe chmod 0600 'lvm/backup/ubuntu-vg'
  maybe chmod 0644 'lvm/lvm.conf'
+maybe chmod 0644 'lvm/lvmlocal.conf'
+maybe chmod 0755 'lvm/profile'
+maybe chmod 0644 'lvm/profile/cache-mq.profile'
+maybe chmod 0644 'lvm/profile/cache-smq.profile'
+maybe chmod 0644 'lvm/profile/command_profile_template.profile'
+maybe chmod 0644 'lvm/profile/lvmdbusd.profile'
+maybe chmod 0644 'lvm/profile/metadata_profile_template.profile'
+maybe chmod 0644 'lvm/profile/thin-generic.profile'
+maybe chmod 0644 'lvm/profile/thin-performance.profile'
  maybe chmod 0444 'machine-id'
  maybe chmod 0644 'magic'
  maybe chmod 0644 'magic.mime'
@@ -1869,7 +1854,6 @@ maybe chmod 0644 'modprobe.d/dkms.conf'
  maybe chmod 0644 'modprobe.d/fbdev-blacklist.conf'
  maybe chmod 0644 'modprobe.d/intel-microcode-blacklist.conf'
  maybe chmod 0644 'modprobe.d/iwlwifi.conf'
-maybe chmod 0644 'modprobe.d/mlx4.conf'
  maybe chmod 0644 'modprobe.d/nouveau-kms.conf'
  maybe chmod 0644 'modprobe.d/nvidia-375_hybrid.conf'
  maybe chmod 0644 'modprobe.d/nvidia-384_hybrid.conf'
@@ -1897,7 +1881,6 @@ maybe chmod 0755 'network/if-down.d/avahi-autoipd'
  maybe chmod 0755 'network/if-down.d/openvpn'
  maybe chmod 0755 'network/if-down.d/postfix'
  maybe chmod 0755 'network/if-down.d/resolvconf'
-maybe chmod 0755 'network/if-down.d/upstart'
  maybe chmod 0755 'network/if-post-down.d'
  maybe chmod 0755 'network/if-post-down.d/vlan'
  maybe chmod 0755 'network/if-post-down.d/wireless-tools'
@@ -1914,7 +1897,6 @@ maybe chmod 0755 'network/if-up.d/ip'
  maybe chmod 0755 'network/if-up.d/openssh-server'
  maybe chmod 0755 'network/if-up.d/openvpn'
  maybe chmod 0755 'network/if-up.d/postfix'
-maybe chmod 0755 'network/if-up.d/upstart'
  maybe chmod 0755 'network/if-up.d/vlan'
  maybe chmod 0644 'network/interfaces'
  maybe chmod 0755 'network/interfaces.d'
@@ -2040,7 +2022,7 @@ maybe chmod 0644 'pam.d/systemd-user'
  maybe chmod 0644 'pam.d/unity'
  maybe chmod 0664 'papersize'
  maybe chmod 0644 'passwd'
-maybe chmod 0600 'passwd-'
+maybe chmod 0644 'passwd-'
  maybe chmod 0755 'pcmcia'
  maybe chmod 0644 'pcmcia/config.opts'
  maybe chmod 0755 'perl'
@@ -2145,6 +2127,7 @@ maybe chmod 0644 'profile.d/appmenu-qt5.sh'
  maybe chmod 0644 'profile.d/apps-bin-path.sh'
  maybe chmod 0644 'profile.d/bash_completion.sh'
  maybe chmod 0644 'profile.d/cedilla-portuguese.sh'
+maybe chmod 0644 'profile.d/input-method-config.sh'
  maybe chmod 0755 'profile.d/jdk.csh'
  maybe chmod 0755 'profile.d/jdk.sh'
  maybe chmod 0644 'profile.d/vte-2.91.sh'
@@ -2322,7 +2305,8 @@ maybe chmod 0644 'sgml/metacity-common.cat'
  maybe chmod 0644 'sgml/xml-core.cat'
  maybe chgrp 'shadow' 'shadow'
  maybe chmod 0640 'shadow'
-maybe chmod 0600 'shadow-'
+maybe chgrp 'shadow' 'shadow-'
+maybe chmod 0640 'shadow-'
  maybe chmod 0644 'shells'
  maybe chmod 0755 'signon-ui'
  maybe chmod 0755 'signon-ui/webkit-options.d'
@@ -2410,18 +2394,18 @@ maybe chmod 0755 'systemd/system/bluetooth.target.wants'
  maybe chmod 0755 'systemd/system/cloud-final.service.wants'
  maybe chmod 0755 'systemd/system/default.target.wants'
  maybe chmod 0755 'systemd/system/display-manager.service.wants'
+maybe chmod 0755 'systemd/system/emergency.target.wants'
  maybe chmod 0755 'systemd/system/final.target.wants'
  maybe chmod 0755 'systemd/system/getty.target.wants'
  maybe chmod 0755 'systemd/system/graphical.target.wants'
-maybe chmod 0755 'systemd/system/hibernate.target.wants'
-maybe chmod 0755 'systemd/system/hybrid-sleep.target.wants'
  maybe chmod 0755 'systemd/system/multi-user.target.wants'
  maybe chmod 0755 'systemd/system/network-online.target.wants'
  maybe chmod 0755 'systemd/system/paths.target.wants'
  maybe chmod 0755 'systemd/system/printer.target.wants'
+maybe chmod 0755 'systemd/system/rescue.target.wants'
  maybe chmod 0755 'systemd/system/sockets.target.wants'
-maybe chmod 0755 'systemd/system/suspend.target.wants'
  maybe chmod 0755 'systemd/system/sysinit.target.wants'
+maybe chmod 0755 'systemd/system/systemd-resolved.service.wants'
  maybe chmod 0644 'systemd/system/teamviewerd.service'
  maybe chmod 0755 'systemd/system/timers.target.wants'
  maybe chmod 0644 'systemd/timesyncd.conf'
@@ -2440,6 +2424,7 @@ maybe chmod 0644 'timezone'
  maybe chmod 0755 'timidity'
  maybe chmod 0644 'timidity/freepats.cfg'
  maybe chmod 0755 'tmpfiles.d'
+maybe chmod 0644 'tmpfiles.d/screen-cleanup.conf'
  maybe chmod 0600 'u2f_mappings'
  maybe chmod 0644 'ucf.conf'
  maybe chmod 0755 'udev'
@@ -2471,6 +2456,7 @@ maybe chmod 0755 'update-manager/release-upgrades.d'
  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 0755 'update-motd.d/90-updates-available'
  maybe chmod 0755 'update-motd.d/91-release-upgrade'
  maybe chmod 0755 'update-motd.d/98-fsck-at-reboot'
@@ -2541,6 +2527,7 @@ maybe chmod 0644 'xdg/autostart/unity-settings-daemon.desktop'
  maybe chmod 0644 'xdg/autostart/update-notifier.desktop'
  maybe chmod 0644 'xdg/autostart/user-dirs-update-gtk.desktop'
  maybe chmod 0644 'xdg/autostart/vino-server.desktop'
+maybe chmod 0644 'xdg/autostart/xdg-user-dirs.desktop'
  maybe chmod 0644 'xdg/autostart/zeitgeist-datahub.desktop'
  maybe chmod 0755 'xdg/menus'
  maybe chmod 0755 'xdg/menus/applications-merged'
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/60xdg-user-dirs-update b/X11/Xsession.d/60xdg-user-dirs-update

deleted file mode 100644 (file)

index 7a0f8ab..0000000
--- a/X11/Xsession.d/60xdg-user-dirs-update
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/xdg-user-dirs-update ]; then
-       /usr/bin/xdg-user-dirs-update
-fi
diff --git a/X11/Xsession.d/75dbus_dbus-launch b/X11/Xsession.d/75dbus_dbus-launch

index 2b5cc577fd546f5cd5de06022f7f070302893d0c..fcac6f42c9f3d5a027287804ee5ca9d0769a969c 100644 (file)
--- a/X11/Xsession.d/75dbus_dbus-launch
+++ b/X11/Xsession.d/75dbus_dbus-launch
@@ -13,5 +13,10 @@ if has_option use-session-dbus; then
  fi
  
  if [ -n "$STARTDBUS" ]; then
-  STARTUP="$DBUSLAUNCH --exit-with-session $STARTUP"
+  # Note that anything that is D-Bus-activated between here and
+  # 95dbus_update-activation-env will not have the complete environment
+  # set up by Xsession.d, unless the Xsession.d snippet that sets the
+  # environment variable also calls dbus-update-activation-environment.
+  # See <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815503>
+  eval $($DBUSLAUNCH --exit-with-session --sh-syntax)
  fi
diff --git a/X11/Xsession.d/90atk-adaptor b/X11/Xsession.d/90atk-adaptor

index be04b9e0ba3248845fe7a9f833a090b71372336f..e548b294e5b745345d83c8fcce380a9cdb041d97 100644 (file)
--- a/X11/Xsession.d/90atk-adaptor
+++ b/X11/Xsession.d/90atk-adaptor
@@ -23,3 +23,6 @@ add_module gail
  add_module atk-bridge
  
  export GTK_MODULES
+if [ -x "/usr/bin/dbus-update-activation-environment" ]; then
+        dbus-update-activation-environment --verbose --systemd GTK_MODULES
+fi
diff --git a/X11/Xsession.d/90qt-a11y b/X11/Xsession.d/90qt-a11y

index b5903d6ede56b0b4692c1e85d2a0f901a3889c0f..29923211b7f3dcb77d24f01eb5f9328d8e7b7dfb 100644 (file)
--- a/X11/Xsession.d/90qt-a11y
+++ b/X11/Xsession.d/90qt-a11y
@@ -4,6 +4,9 @@
  # This file is sourced by Xsession(5), not executed.
  
  QT_ACCESSIBILITY=1
-QT_LINUX_ACCESSIBILITY_ALWAYS_ON=1
  
-export QT_ACCESSIBILITY QT_LINUX_ACCESSIBILITY_ALWAYS_ON
+export QT_ACCESSIBILITY
+
+if [ -x "/usr/bin/dbus-update-activation-environment" ]; then
+        dbus-update-activation-environment --verbose --systemd QT_ACCESSIBILITY QT_LINUX_ACCESSIBILITY_ALWAYS_ON
+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/X11/XvMCConfig b/X11/XvMCConfig

new file mode 100644 (file)

index 0000000..2c0fe52
--- /dev/null
+++ b/X11/XvMCConfig
@@ -0,0 +1 @@
+libXvMC.so.1
diff --git a/X11/app-defaults/XTerm b/X11/app-defaults/XTerm

index 2a0ec284654e201a49003f43b61f92eaa296f91c..114101233983ec635e270a993d3ffcce161e6f66 100644 (file)
--- a/X11/app-defaults/XTerm
+++ b/X11/app-defaults/XTerm
@@ -1,8 +1,8 @@
-! $XTermId: XTerm.ad,v 1.99 2013/06/23 08:57:13 Ross.Combs Exp $
+! $XTermId: XTerm.ad,v 1.102 2016/12/22 02:07:39 tom Exp $
  ! -----------------------------------------------------------------------------
  ! this file is part of xterm
  !
-! Copyright 1996-2010,2011 by Thomas E. Dickey
+! Copyright 1996-2011,2016 by Thomas E. Dickey
  ! 
  !                         All Rights Reserved
  ! 
@@ -52,6 +52,8 @@
  *mainMenu*print-on-error*Label:  Print-All on Error
  *mainMenu*print*Label:  Print Window
  *mainMenu*print-redir*Label:  Redirect to Printer
+*mainMenu*dump-html*Label:  XHTML Screen Dump
+*mainMenu*dump-svg*Label:  SVG Screen Dump
  *mainMenu*8-bit control*Label: 8-Bit Controls
  *mainMenu*backarrow key*Label: Backarrow Key (BS/DEL)
  *mainMenu*num-lock*Label: Alt/NumLock Modifiers
@@ -133,6 +135,7 @@
  
  *fontMenu*allow-color-ops*Label:       Allow Color Ops
  *fontMenu*allow-font-ops*Label:        Allow Font Ops
+*fontMenu*allow-mouse-ops*Label:       Allow Mouse Ops
  *fontMenu*allow-tcap-ops*Label:        Allow Termcap Ops
  *fontMenu*allow-title-ops*Label:       Allow Title Ops
  *fontMenu*allow-window-ops*Label:      Allow Window Ops
diff --git a/X11/fonts/Type1/gsfonts-x11.alias b/X11/fonts/Type1/gsfonts-x11.alias

index 2fa66a601e12e64c713409185ce04e213c4cd00d..055877ee26b95ced553a34598acdb56d59331599 100644 (file)
--- a/X11/fonts/Type1/gsfonts-x11.alias
+++ b/X11/fonts/Type1/gsfonts-x11.alias
@@ -207,7 +207,7 @@
  "-urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-15" "-urw-nimbus roman no9 l-medium-i-normal-medium-0-0-0-0-p-0-iso8859-15"
  !
  -adobe-symbol-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific "-urw-standard symbols l-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific"
-"-urw-standard symbols l-regular-r-normal--0-0-0-0-p-0-adobe-fontspecific" "-urw-standard symbols l-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific" 
+"-urw-standard symbols l-regular-r-normal--0-0-0-0-p-0-adobe-fontspecific" "-urw-standard symbols l-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific"
  !
  "-adobe-zapf chancery-medium-i-normal--0-0-0-0-p-0-iso8859-1" "-urw-urw chancery l-medium-i-normal-medium-0-0-0-0-p-0-iso8859-1"
  "-adobe-zapf chancery-medium-i-normal--0-0-0-0-p-0-iso8859-2" "-urw-urw chancery l-medium-i-normal-medium-0-0-0-0-p-0-iso8859-2"
diff --git a/acpi/events/powerbtn b/acpi/events/powerbtn

deleted file mode 100644 (file)

index 8347570..0000000
--- a/acpi/events/powerbtn
+++ /dev/null
@@ -1,13 +0,0 @@
-# /etc/acpi/events/powerbtn
-# This is called when the user presses the power button and calls
-# /etc/acpi/powerbtn.sh for further processing.
-
-# Optionally you can specify the placeholder %e. It will pass
-# through the whole kernel event message to the program you've
-# specified.
-
-# We need to react on "button power.*" and "button/power.*" because
-# of kernel changes.
-
-event=button[ /]power
-action=/etc/acpi/powerbtn.sh
diff --git a/acpi/powerbtn.sh b/acpi/powerbtn.sh

deleted file mode 100755 (executable)

index e6ae71b..0000000
--- a/acpi/powerbtn.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# /etc/acpi/powerbtn.sh
-# Initiates a shutdown when the power putton has been
-# pressed.
-
-[ -r /usr/share/acpi-support/power-funcs ] && . /usr/share/acpi-support/power-funcs
-
-# If logind is running, it already handles power button presses; desktop
-# environments put inhibitors to logind if they want to handle the key
-# themselves.
-if pidof systemd-logind >/dev/null; then
-    exit 0
-fi
-
-# getXuser gets the X user belonging to the display in $displaynum.
-# If you want the foreground X user, use getXconsole!
-getXuser() {
-        user=`pinky -fw | awk '{ if ($2 == ":'$displaynum'" || $(NF) == ":'$displaynum'" ) { print $1; exit; } }'`
-        if [ x"$user" = x"" ]; then
-                startx=`pgrep -n startx`
-                if [ x"$startx" != x"" ]; then
-                        user=`ps -o user --no-headers $startx`
-                fi
-        fi
-        if [ x"$user" != x"" ]; then
-                userhome=`getent passwd $user | cut -d: -f6`
-                export XAUTHORITY=$userhome/.Xauthority
-        else
-                export XAUTHORITY=""
-        fi
-        export XUSER=$user
-}
-
-# Skip if we just in the middle of resuming.
-test -f /var/lock/acpisleep && exit 0
-
-# If the current X console user is running a power management daemon that
-# handles suspend/resume requests, let them handle policy This is effectively
-# the same as 'acpi-support's '/usr/share/acpi-support/policy-funcs' file.
-
-[ -r /usr/share/acpi-support/power-funcs ] && getXconsole
-PMS="gnome-settings-daemon kpowersave xfce4-power-manager"
-PMS="$PMS guidance-power-manager.py dalston-power-applet"
-PMS="$PMS mate-settings-daemon"
-PMS="$PMS unity-settings-daemon"
-
-if pidof -x $PMS > /dev/null; then
-        exit
-elif test "$XUSER" != "" && pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop --user $XUSER kded kded loadedModules | grep -q klaptopdaemon; then
-        exit
-elif test "$XUSER" != "" && test -x /usr/bin/qdbus; then
-        kded4pid=$(pgrep -n -u $XUSER kded4)
-        if test "$kded4pid" != ""; then
-                dbusaddr=$(su - $XUSER -c "grep -z DBUS_SESSION_BUS_ADDRESS /proc/$kded4pid/environ")
-                if test "$dbusaddr" != "" && su - $XUSER -c "export $dbusaddr; qdbus org.kde.kded" | grep -q powerdevil; then
-                        exit
-                fi
-        fi
-fi
-
-# If all else failed, just initiate a plain shutdown.
-/sbin/shutdown -h now "Power button pressed"
diff --git a/alternatives/libblas.so.3 b/alternatives/libblas.so.3

deleted file mode 120000 (symlink)

index 47d84db..0000000
--- a/alternatives/libblas.so.3
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libblas/libblas.so.3
-\ No newline at end of file
diff --git a/alternatives/libblas.so.3-x86_64-linux-gnu b/alternatives/libblas.so.3-x86_64-linux-gnu

new file mode 120000 (symlink)

index 0000000..2a847f1
--- /dev/null
+++ b/alternatives/libblas.so.3-x86_64-linux-gnu
@@ -0,0 +1 @@
+/usr/lib/x86_64-linux-gnu/blas/libblas.so.3
+\ No newline at end of file
diff --git a/alternatives/updatedb.8.gz b/alternatives/updatedb.8.gz

new file mode 120000 (symlink)

index 0000000..d48060b
--- /dev/null
+++ b/alternatives/updatedb.8.gz
@@ -0,0 +1 @@
+/usr/share/man/man8/updatedb.mlocate.8.gz
+\ No newline at end of file
diff --git a/apg.conf b/apg.conf

index c4d47d10b71d12a9cea31e85108dc3ddf9977f18..eb038876d35cc5883d6486fe127d8a626cc79d49 100644 (file)
--- a/apg.conf
+++ b/apg.conf
@@ -1,4 +1,15 @@
-# this file sets defaults for apg if apg is called without parameters
-
-APG_PARM="-M NCL -a 0 -s -m 8 -x 12 -t"
+#APG_PARM sets the defaults if apg is executed without any command arguments
+#
+#
+#Examples:
+#
+#Pronounceable passwords with special characters:
+#APG_PARM="-c /dev/urandom  -m 8 -x 14  -M SNCL  -t"
+#
+#Pronounceable passwords without special characters:
+#APG_PARM="-c /dev/urandom  -m 8 -x 14  -M NCL  -t"
+#
+#Random passwords:
+#APG_PARM="-c /dev/urandom  -m 20 -x 20  -a 1 -M SNCL"
  
+APG_PARM="-c /dev/urandom  -m 8 -x 14  -M SNCL  -t"
diff --git a/apparmor.d/abstractions/lightdm b/apparmor.d/abstractions/lightdm

index 5289a92776fa4da9b3c299ccb18346cc41cc784e..4be3d4a31464538319acca9bbfa01c968d38f3f7 100644 (file)
--- a/apparmor.d/abstractions/lightdm
+++ b/apparmor.d/abstractions/lightdm
@@ -77,6 +77,7 @@
    /{,var/}run/ r,
    # necessary for writing to sockets, etc.
    /{,var/}run/** rmkix,
+  /{,var/}run/mir_socket rw,
    /{,var/}run/screen/** wl,
    /{,var/}run/shm/** wl,
    /{,var/}run/uuidd/request w,
@@ -95,7 +96,7 @@
    unix (receive) peer=(label=unconfined),
    unix (create),
    unix (getattr, getopt, setopt, shutdown),
-  unix (bind, listen) type=stream addr="@/com/ubuntu/upstart-session/**",
+  unix (bind, listen, accept, receive, send) type=stream addr="@/com/ubuntu/upstart-session/**",
    unix (bind, listen) type=stream addr="@/tmp/dbus-*",
    unix (bind, listen) type=stream addr="@/tmp/.ICE-unix/[0-9]*",
    unix (bind, listen) type=stream addr="@/dbus-vfs-daemon/*",
diff --git a/apparmor.d/lightdm-guest-session b/apparmor.d/lightdm-guest-session

index cc7aa17d8172b811a157bcb87b668ef1df61acec..f23cd234177e08fe9e2401c5927cf862bcb0eae3 100644 (file)
--- a/apparmor.d/lightdm-guest-session
+++ b/apparmor.d/lightdm-guest-session
@@ -19,6 +19,9 @@
    /usr/bin/sogou-sys-notify ix,
    /tmp/sogou-qimpanel:* rwl,
  
+  # Allow ibus
+  unix (bind, listen) type=stream addr="@tmp/ibus/*",
+
    # mozc_server needs special treatment due to C/S design
    unix (bind, listen) type=stream addr="@tmp/.mozc.*",
  }
diff --git a/apparmor.d/usr.lib.telepathy b/apparmor.d/usr.lib.telepathy

index d83af432fae7669a9f1825624a535ca6d9ce8127..cfd9a671ee0dedc4b722825a13cfeb8c32ed701d 100644 (file)
--- a/apparmor.d/usr.lib.telepathy
+++ b/apparmor.d/usr.lib.telepathy
@@ -121,7 +121,7 @@
      /custom/etc/dconf/        r,
      /custom/etc/dconf/**      r,
  
-    /bin/dash ix,
+    /{usr/,}bin/dash ix,
      /usr/bin/gconftool-2 ix,
  
      # Maybe in abstractions?
@@ -165,7 +165,7 @@
      deny @{PROC}/[0-9]*/mounts r,
      deny /sbin/ldconfig x,
      deny /usr/bin/gcc-[0-9]* x,
-    /bin/uname ix,
+    /{usr/,}bin/uname ix,
  
      # for telepathy-haze (LP: #867793, LP: #871497, LP: #942973, LP: #1021876)
      owner @{HOME}/.config/indicators/          rw,
diff --git a/apparmor.d/usr.sbin.ippusbxd b/apparmor.d/usr.sbin.ippusbxd

index d8e9f77a627c0094de0104225814704a7b74ff29..d017dbfe012659066e493d34391ba7f3fa307f41 100644 (file)
--- a/apparmor.d/usr.sbin.ippusbxd
+++ b/apparmor.d/usr.sbin.ippusbxd
@@ -6,19 +6,28 @@
  
  /usr/sbin/ippusbxd {
    #include <abstractions/base>
+  #include <abstractions/dbus>
+
+  capability wake_alarm,
  
    /usr/sbin/ippusbxd mr,
  
    # Scanning for USB devices
    /dev/bus/usb/ r,
+  /dev/bus/usb/*/* rw,
    /etc/udev/udev.conf r,
    /sys/bus/ r,
    /sys/bus/usb/devices/ r,
    /sys/class/ r,
-  /sys/devices/*/*/*/usb8/busnum r,
-  /sys/devices/*/*/*/usb8/descriptors r,
-  /sys/devices/*/*/*/usb8/devnum r,
-  /sys/devices/*/*/*/usb8/speed r,
-  /sys/devices/*/*/*/usb8/uevent r,
+  /sys/devices/** r,
+  /run/udev/data/** r,
+
+  # Network access
+  network inet raw,
+  network inet6 raw,
+  network inet stream,
+  network inet6 stream,
+  network netlink raw,
+  network netlink stream,
  
  }
diff --git a/apt/apt.conf.d/50command-not-found b/apt/apt.conf.d/50command-not-found

new file mode 100644 (file)

index 0000000..320662b
--- /dev/null
+++ b/apt/apt.conf.d/50command-not-found
@@ -0,0 +1,16 @@
+## This file is provided by command-not-found(1) to download
+## Commands metadata files.
+
+Acquire::IndexTargets {
+    # The deb822 metadata files
+    deb::CNF  {
+        MetaKey "$(COMPONENT)/cnf/Commands-$(NATIVE_ARCHITECTURE)";
+        ShortDescription "Commands-$(NATIVE_ARCHITECTURE)";
+        Description "$(RELEASE)/$(COMPONENT) $(NATIVE_ARCHITECTURE) c-n-f Metadata";
+    };
+};
+
+# Refresh AppStream cache when APT's cache is updated (i.e. apt update)
+APT::Update::Post-Invoke-Success {
+    "if /usr/bin/test -w /var/lib/command-not-found/ -a -e /usr/lib/cnf-update-db; then /usr/lib/cnf-update-db > /dev/null; fi";
+};
diff --git a/apt/apt.conf.d/50unattended-upgrades b/apt/apt.conf.d/50unattended-upgrades

index a274554cb64cfd7095fa520ee90c165151d9fe3d..96f734c42eab4d6cb2b3de20a1aeb90bf25c3fee 100644 (file)
--- a/apt/apt.conf.d/50unattended-upgrades
+++ b/apt/apt.conf.d/50unattended-upgrades
@@ -1,6 +1,10 @@
  // Automatically upgrade packages from these (origin:archive) pairs
+//
+// Note that in Ubuntu security updates may pull in new dependencies
+// from non-security sources (e.g. chromium). By allowing the release
+// pocket these get automatically pulled in.
  Unattended-Upgrade::Allowed-Origins {
-       "${distro_id}:${distro_codename}";
+        "${distro_id}:${distro_codename}";
         "${distro_id}:${distro_codename}-security";
         // Extended Security Maintenance; doesn't necessarily exist for
         // every release and this system may not have it installed, but if
@@ -20,6 +24,10 @@ Unattended-Upgrade::Package-Blacklist {
  //     "libc6-i686";
  };
  
+// This option will controls whether the development release of Ubuntu will be
+// upgraded automatically.
+Unattended-Upgrade::DevRelease "false";
+
  // This option allows you to control if on a unclean dpkg exit
  // unattended-upgrades will automatically run 
  //   dpkg --force-confold --configure -a
@@ -27,12 +35,12 @@ Unattended-Upgrade::Package-Blacklist {
  //Unattended-Upgrade::AutoFixInterruptedDpkg "false";
  
  // Split the upgrade into the smallest possible chunks so that
-// they can be interrupted with SIGUSR1. This makes the upgrade
+// they can be interrupted with SIGTERM. This makes the upgrade
  // a bit slower but it has the benefit that shutdown while a upgrade
  // is running is possible (with a small delay)
-//Unattended-Upgrade::MinimalSteps "true";
+//Unattended-Upgrade::MinimalSteps "false";
  
-// Install all unattended-upgrades when the machine is shuting down
+// Install all unattended-upgrades when the machine is shutting down
  // instead of doing it in the background while the machine is running
  // This will (obviously) make shutdown slower
  //Unattended-Upgrade::InstallOnShutdown "true";
@@ -47,6 +55,10 @@ Unattended-Upgrade::Package-Blacklist {
  // is to always send a mail if Unattended-Upgrade::Mail is set
  //Unattended-Upgrade::MailOnlyOnError "true";
  
+// Remove unused automatically installed kernel-related packages
+// (kernel images, kernel headers and kernel version locked tools).
+//Unattended-Upgrade::Remove-Unused-Kernel-Packages "false";
+
  // Do automatic removal of new unused dependencies after the upgrade
  // (equivalent to apt-get autoremove)
  //Unattended-Upgrade::Remove-Unused-Dependencies "false";
@@ -63,3 +75,17 @@ Unattended-Upgrade::Package-Blacklist {
  // Use apt bandwidth limit feature, this example limits the download
  // speed to 70kb/sec
  //Acquire::http::Dl-Limit "70";
+
+// Enable logging to syslog. Default is False
+// Unattended-Upgrade::SyslogEnable "false";
+
+// Specify syslog facility. Default is daemon
+// Unattended-Upgrade::SyslogFacility "daemon";
+
+// Download and install upgrades only on AC power
+// (i.e. skip or gracefully stop updates on battery)
+// Unattended-Upgrade::OnlyOnACPower "true";
+
+// Download and install upgrades only on non-metered connection
+// (i.e. skip or gracefully stop updates on a metered connection)
+// Unattended-Upgrade::Skip-Updates-On-Metered-Connections "true";
diff --git a/apt/trusted.gpg b/apt/trusted.gpg

index a043e07b94669e29dffb4765bd6079ebbd30cb06..903c3721b3703dc936b3464a0cd6aec199ec0d48 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/at-spi2/accessibility.conf b/at-spi2/accessibility.conf

deleted file mode 100644 (file)

index fc7d0f4..0000000
--- a/at-spi2/accessibility.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <type>accessibility</type>
-
-<servicedir>/usr/share/dbus-1/accessibility-services</servicedir>
-  <auth>EXTERNAL</auth>
-
-  <listen>unix:tmpdir=/tmp</listen>
-
-  <policy context="default">
-    <!-- Allow root to connect -->
-    <allow user="root"/>
-    <!-- Allow everything to be sent -->
-    <allow send_destination="*" eavesdrop="true"/>
-    <!-- Allow everything to be received -->
-    <allow eavesdrop="true"/>
-    <!-- Allow anyone to own anything -->
-    <allow own="*"/>
-  </policy>
-
-  <limit name="max_incoming_bytes">1000000000</limit>
-  <limit name="max_outgoing_bytes">1000000000</limit>
-  <limit name="max_message_size">1000000000</limit>
-  <limit name="service_start_timeout">120000</limit>  
-  <limit name="auth_timeout">240000</limit>
-  <limit name="max_completed_connections">100000</limit>  
-  <limit name="max_incomplete_connections">10000</limit>
-  <limit name="max_connections_per_user">100000</limit>
-  <limit name="max_pending_service_starts">10000</limit>
-  <limit name="max_names_per_connection">50000</limit>
-  <limit name="max_match_rules_per_connection">50000</limit>
-  <limit name="max_replies_per_connection">50000</limit>
-  <limit name="reply_timeout">300000</limit>
-</busconfig>
diff --git a/avahi/avahi-autoipd.action b/avahi/avahi-autoipd.action

index c2db9942c32c191c665c6e7c7d0be287ea0a0967..66dbb3318289ac8d4a925a3f028d6d717ec32584 100755 (executable)
--- a/avahi/avahi-autoipd.action
+++ b/avahi/avahi-autoipd.action
@@ -41,6 +41,7 @@ if [ -x /bin/ip -o -x /sbin/ip ] ; then
  
      case "$1" in
          BIND)
+            ip addr flush dev "$2" label "$2:avahi"
              ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2"
              ip route add default dev "$2" metric "$METRIC" scope link ||:
              ;;
diff --git a/bash_completion.d/cryptdisks b/bash_completion.d/cryptdisks

deleted file mode 100644 (file)

index cbcfe5d..0000000
--- a/bash_completion.d/cryptdisks
+++ /dev/null
@@ -1,13 +0,0 @@
-# cryptdisks_{start,stop} completion by first row of crypttab
-#
-# Copyright 2013 Claudius Hubig <cl_crds@chubig.net>, 2-clause BSD
-
-_cryptdisks() {
-    local tf;
-    tf=${TABFILE-"/etc/crypttab"};
-    COMPREPLY=($(egrep -v "^[[:space:]]*(#|$)" "${tf}" | egrep -o "^${COMP_WORDS[COMP_CWORD]}[^[:space:]]*"));
-    return 0;
-}
-
-complete -F _cryptdisks cryptdisks_start;
-complete -F _cryptdisks cryptdisks_stop;
diff --git a/console-setup/cached_UTF-8_del.kmap.gz b/console-setup/cached_UTF-8_del.kmap.gz

new file mode 100644 (file)

index 0000000..ca76dcc

Binary files /dev/null and b/console-setup/cached_UTF-8_del.kmap.gz differ
diff --git a/console-setup/cached_setup_font.sh b/console-setup/cached_setup_font.sh

new file mode 100755 (executable)

index 0000000..b11959c
--- /dev/null
+++ b/console-setup/cached_setup_font.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+setfont '/etc/console-setup/Uni2-Fixed16.psf.gz' 
+
+if ls /dev/fb* >/dev/null 2>/dev/null; then
+    for i in /dev/vcs[0-9]*; do
+        { :
+            setfont '/etc/console-setup/Uni2-Fixed16.psf.gz' 
+        } < /dev/tty${i#/dev/vcs} > /dev/tty${i#/dev/vcs}
+    done
+fi
+
+mkdir -p /run/console-setup
+> /run/console-setup/font-loaded
+for i in /dev/vcs[0-9]*; do
+    { :
+printf '\033%%G' 
+    } < /dev/tty${i#/dev/vcs} > /dev/tty${i#/dev/vcs}
+done
diff --git a/console-setup/cached_setup_keyboard.sh b/console-setup/cached_setup_keyboard.sh

new file mode 100755 (executable)

index 0000000..30b46c1
--- /dev/null
+++ b/console-setup/cached_setup_keyboard.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ -f /run/console-setup/keymap_loaded ]; then
+    rm /run/console-setup/keymap_loaded
+    exit 0
+fi
+kbd_mode '-u' < '/dev/tty1' 
+kbd_mode '-u' < '/dev/tty2' 
+kbd_mode '-u' < '/dev/tty3' 
+kbd_mode '-u' < '/dev/tty4' 
+kbd_mode '-u' < '/dev/tty5' 
+kbd_mode '-u' < '/dev/tty6' 
+loadkeys '/etc/console-setup/cached_UTF-8_del.kmap.gz' > '/dev/null' 
diff --git a/console-setup/cached_setup_terminal.sh b/console-setup/cached_setup_terminal.sh

new file mode 100755 (executable)

index 0000000..494e363
--- /dev/null
+++ b/console-setup/cached_setup_terminal.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+{ :
+printf '\033%%G' 
+} < /dev/tty${1#vcs} > /dev/tty${1#vcs}
diff --git a/console-setup/compose.ISO-8859-1.inc b/console-setup/compose.ISO-8859-1.inc

index e85f4d2fb63fdba7dfe3dc78059a325df4e76c4f..a285ddfc463906446c96104bc492b2dd35dd015f 100644 (file)
--- a/console-setup/compose.ISO-8859-1.inc
+++ b/console-setup/compose.ISO-8859-1.inc
@@ -56,12 +56,9 @@ compose '/' '^' to '|'
  compose '/' 'c' to '¢'
  compose '/' 'o' to 'ø'
  compose '/' 'u' to 'µ'
-compose '0' 'c' to '©'
  compose '1' '2' to '½'
  compose '1' '4' to '¼'
-compose '1' 's' to '¹'
  compose '3' '4' to '¾'
-compose '3' 's' to '³'
  compose ':' '-' to '÷'
  compose '<' '/' to '\\'
  compose '<' '<' to '«'
@@ -133,19 +130,19 @@ compose '`' 'u' to '
  compose 'a' 'e' to 'æ'
  compose 'a' 'o' to 'å'
  compose 'a' 't' to '@'
-compose 'b' 'v' to '¦'
  compose 'c' '0' to '©'
  compose 'c' 'o' to '©'
-compose 'l' 'v' to '|'
  compose 'o' 'c' to '©'
-compose 'o' 's' to '§'
+compose 'o' 'x' to '¤'
  compose 'r' 'o' to '®'
  compose 's' '0' to '§'
  compose 's' '1' to '¹'
  compose 's' '2' to '²'
  compose 's' '3' to '³'
+compose 's' 'o' to '§'
  compose 't' 'h' to 'þ'
  compose 'v' 'b' to '¦'
+compose 'v' 'l' to '|'
  compose 'x' '0' to '¤'
  compose 'x' 'o' to '¤'
  compose '|' 'c' to '¢'
@@ -156,16 +153,3 @@ compose '~' 'O' to '
  compose '~' 'a' to 'ã'
  compose '~' 'n' to 'ñ'
  compose '~' 'o' to 'õ'
-compose '¨' 'A' to 'Ä'
-compose '¨' 'E' to 'Ë'
-compose '¨' 'I' to 'Ï'
-compose '¨' 'O' to 'Ö'
-compose '¨' 'U' to 'Ü'
-compose '¨' 'a' to 'ä'
-compose '¨' 'e' to 'ë'
-compose '¨' 'i' to 'ï'
-compose '¨' 'o' to 'ö'
-compose '¨' 'u' to 'ü'
-compose '¨' 'y' to 'ÿ'
-compose '°' 'A' to 'Å'
-compose '°' 'a' to 'å'
diff --git a/console-setup/compose.ISO-8859-13.inc b/console-setup/compose.ISO-8859-13.inc

index ae9fa66b750fa10c725b1de8fedd0b99724666b0..5b45a261a34264ccd754d5939379fc5b1c950977 100644 (file)
--- a/console-setup/compose.ISO-8859-13.inc
+++ b/console-setup/compose.ISO-8859-13.inc
@@ -76,14 +76,9 @@ compose '/' 'c' to '
  compose '/' 'l' to 'ù'
  compose '/' 'o' to '¸'
  compose '/' 'u' to 'µ'
-compose '0' 'c' to '©'
-compose '0' 's' to '§'
-compose '0' 'x' to '¤'
  compose '1' '2' to '½'
  compose '1' '4' to '¼'
-compose '1' 's' to '¹'
  compose '3' '4' to '¾'
-compose '3' 's' to '³'
  compose ':' '-' to '÷'
  compose ';' 'A' to 'À'
  compose ';' 'E' to 'Æ'
@@ -146,16 +141,17 @@ compose '_' 'u' to '
  compose 'a' 'e' to '¿'
  compose 'a' 'o' to 'å'
  compose 'a' 't' to '@'
-compose 'b' 'v' to '¦'
+compose 'c' '0' to '©'
  compose 'c' 'o' to '©'
  compose 'm' 'u' to 'µ'
  compose 'o' 'c' to '©'
-compose 'o' 's' to '§'
  compose 'o' 'x' to '¤'
  compose 'r' 'o' to '®'
  compose 's' '0' to '§'
  compose 's' '1' to '¹'
  compose 's' '2' to '²'
+compose 's' '3' to '³'
+compose 's' 'o' to '§'
  compose 'v' 'b' to '¦'
  compose 'x' '0' to '¤'
  compose 'x' 'o' to '¤'
@@ -163,9 +159,3 @@ compose '|' 'c' to '
  compose '|' '|' to '¦'
  compose '~' 'O' to 'Õ'
  compose '~' 'o' to 'õ'
-compose '°' 'A' to 'Å'
-compose '°' 'E' to 'Ë'
-compose '°' 'Z' to 'Ý'
-compose '°' 'a' to 'å'
-compose '°' 'e' to 'ë'
-compose '°' 'z' to 'ý'
diff --git a/console-setup/compose.ISO-8859-14.inc b/console-setup/compose.ISO-8859-14.inc

index ef79f9358de77c87bbb3463c9da1ddf527590608..e2835df69642922ca12be68a018ac1831ae6512d 100644 (file)
--- a/console-setup/compose.ISO-8859-14.inc
+++ b/console-setup/compose.ISO-8859-14.inc
@@ -56,8 +56,6 @@ compose '/' '<' to '\\'
  compose '/' 'O' to 'Ø'
  compose '/' '^' to '|'
  compose '/' 'o' to 'ø'
-compose '0' 'r' to '®'
-compose '0' 's' to '§'
  compose '<' '/' to '\\'
  compose '=' 'l' to '£'
  compose '>' 'A' to 'Â'
@@ -117,10 +115,8 @@ compose '`' 'y' to '
  compose 'a' 'e' to 'æ'
  compose 'a' 't' to '@'
  compose 'c' '0' to '©'
-compose 'l' 'v' to '|'
+compose 'c' 'o' to '©'
  compose 'o' 'c' to '©'
-compose 'o' 'r' to '®'
-compose 'o' 's' to '§'
  compose 'r' '0' to '®'
  compose 'r' 'o' to '®'
  compose 's' '0' to '§'
diff --git a/console-setup/compose.ISO-8859-15.inc b/console-setup/compose.ISO-8859-15.inc

index 2aed615b6d6f91deaa53f880a0cb74dac982d62f..79c92ed8e89e11ba02d8905502943c2ece7f2082 100644 (file)
--- a/console-setup/compose.ISO-8859-15.inc
+++ b/console-setup/compose.ISO-8859-15.inc
@@ -55,10 +55,6 @@ compose '/' '^' to '|'
  compose '/' 'c' to '¢'
  compose '/' 'o' to 'ø'
  compose '/' 'u' to 'µ'
-compose '0' 'c' to '©'
-compose '0' 's' to '§'
-compose '1' 's' to '¹'
-compose '3' 's' to '³'
  compose ':' '-' to '÷'
  compose '<' '/' to '\\'
  compose '<' '<' to '«'
@@ -138,9 +134,10 @@ compose 'a' 't' to '@'
  compose 'c' '0' to '©'
  compose 'c' 'o' to '©'
  compose 'e' '=' to '¤'
-compose 'l' 'v' to '|'
+compose 'o' 'c' to '©'
  compose 'o' 'e' to '½'
-compose 'o' 'r' to '®'
+compose 'r' 'o' to '®'
+compose 's' '0' to '§'
  compose 's' '1' to '¹'
  compose 's' '2' to '²'
  compose 's' '3' to '³'
@@ -154,5 +151,3 @@ compose '~' 'O' to '
  compose '~' 'a' to 'ã'
  compose '~' 'n' to 'ñ'
  compose '~' 'o' to 'õ'
-compose '°' 'A' to 'Å'
-compose '°' 'a' to 'å'
diff --git a/console-setup/compose.ISO-8859-2.inc b/console-setup/compose.ISO-8859-2.inc

index 8fbda7db6f2e4b381897183c749d12dc197049fb..6692ee3402d2a193ce7ba15d5a9591badc4a4ab5 100644 (file)
--- a/console-setup/compose.ISO-8859-2.inc
+++ b/console-setup/compose.ISO-8859-2.inc
@@ -46,12 +46,9 @@ compose '.' 'e' to '
  compose '.' 'i' to '¹'
  compose '.' 'u' to 'ù'
  compose '.' 'z' to '¿'
-compose '.' ' ' to 'ÿ'
-compose '.' 'ÿ' to 'ÿ'
  compose '/' '/' to '\\'
  compose '/' '<' to '\\'
  compose '/' '^' to '|'
-compose '0' 's' to '§'
  compose ':' '-' to '÷'
  compose '<' '/' to '\\'
  compose '<' '<' to '·'
@@ -115,10 +112,8 @@ compose '^' 'O' to '
  compose '^' 'a' to 'â'
  compose '^' 'i' to 'î'
  compose '^' 'o' to 'ô'
-compose '_' ' ' to '¯'
  compose 'a' 'U' to 'ã'
  compose 'l' '-' to '³'
-compose 'l' 'v' to '|'
  compose 'o' 'e' to '½'
  compose 'o' 'x' to '¤'
  compose 's' '0' to '§'
@@ -127,39 +122,3 @@ compose 'v' 'l' to '|'
  compose 'x' '0' to '¤'
  compose 'x' 'o' to '¤'
  compose 'z' '.' to '¿'
-compose '¢' 'A' to 'Ã'
-compose '¢' 'a' to 'ã'
-compose '°' 'A' to 'Å'
-compose '°' 'U' to 'Ù'
-compose '°' 'a' to 'å'
-compose '°' 'u' to 'ù'
-compose '°' ' ' to '°'
-compose '°' '°' to '°'
-compose '²' 'A' to '¡'
-compose '²' 'E' to 'Ê'
-compose '²' 'a' to '±'
-compose '²' 'e' to 'ê'
-compose '·' 'C' to 'È'
-compose '·' 'D' to 'Ï'
-compose '·' 'E' to 'Ì'
-compose '·' 'L' to '¥'
-compose '·' 'N' to 'Ò'
-compose '·' 'R' to 'Ø'
-compose '·' 'S' to '©'
-compose '·' 'T' to '«'
-compose '·' 'Z' to '®'
-compose '·' 'c' to 'è'
-compose '·' 'd' to 'ï'
-compose '·' 'e' to 'ì'
-compose '·' 'l' to 'µ'
-compose '·' 'n' to 'ò'
-compose '·' 'r' to 'ø'
-compose '·' 's' to '¹'
-compose '·' 't' to '»'
-compose '·' 'z' to '¾'
-compose '¸' 'C' to 'Ç'
-compose '¸' 'S' to 'ª'
-compose '¸' 'T' to 'Þ'
-compose '¸' 'c' to 'ç'
-compose '¸' 's' to 'º'
-compose '¸' 't' to 'þ'
diff --git a/console-setup/compose.ISO-8859-3.inc b/console-setup/compose.ISO-8859-3.inc

index e1b6919057d692e1f386d8acbcfb234cde9477de..7e50b6c5f76e2e889466cf54af6a3ea7be2372fb 100644 (file)
--- a/console-setup/compose.ISO-8859-3.inc
+++ b/console-setup/compose.ISO-8859-3.inc
@@ -57,8 +57,6 @@ compose '/' '/' to '\\'
  compose '/' '<' to '\\'
  compose '/' '^' to '|'
  compose '/' 'u' to 'µ'
-compose '2' 's' to '²'
-compose '3' 's' to '³'
  compose ':' '-' to '÷'
  compose '<' '/' to '\\'
  compose '=' 'c' to '¤'
@@ -138,6 +136,7 @@ compose 'g' 'U' to '
  compose 'r' 'o' to '®'
  compose 's' '0' to '§'
  compose 's' '2' to '²'
+compose 's' '3' to '³'
  compose 's' 'o' to '§'
  compose 'u' 'u' to 'ý'
  compose 'v' 'l' to '|'
@@ -145,23 +144,3 @@ compose '~' 'A' to '
  compose '~' 'O' to 'Õ'
  compose '~' 'a' to 'ã'
  compose '~' 'o' to 'õ'
-compose '¢' 'G' to '«'
-compose '¢' 'U' to 'Ý'
-compose '¢' 'g' to '»'
-compose '¢' 'u' to 'ý'
-compose '¨' 'A' to 'Ä'
-compose '¨' 'E' to 'Ë'
-compose '¨' 'I' to 'Ï'
-compose '¨' 'O' to 'Ö'
-compose '¨' 'U' to 'Ü'
-compose '¨' 'Y' to '¾'
-compose '¨' 'a' to 'ä'
-compose '¨' 'e' to 'ë'
-compose '¨' 'i' to 'ï'
-compose '¨' 'o' to 'ö'
-compose '¨' 'u' to 'ü'
-compose '¨' 'y' to 'ÿ'
-compose '°' 'A' to 'Å'
-compose '°' 'a' to 'å'
-compose '¸' 'S' to 'ª'
-compose '¸' 's' to 'º'
diff --git a/console-setup/compose.ISO-8859-4.inc b/console-setup/compose.ISO-8859-4.inc

index 84945a1c4cc35f2418f56dd84f948188050ee472..4598a22a3b0a713422883d619100991e41220f97 100644 (file)
--- a/console-setup/compose.ISO-8859-4.inc
+++ b/console-setup/compose.ISO-8859-4.inc
@@ -49,13 +49,10 @@ compose '-' 'u' to '
  compose '.' '.' to 'ÿ'
  compose '.' 'E' to 'Ì'
  compose '.' 'e' to 'ì'
-compose '.' 'ÿ' to 'ÿ'
  compose '/' 'O' to 'Ø'
  compose '/' 'T' to '¬'
  compose '/' 'o' to 'ø'
  compose '/' 't' to '¼'
-compose '0' 's' to '§'
-compose '0' 'x' to '¤'
  compose ':' '-' to '÷'
  compose '<' '<' to '·'
  compose '<' 'C' to 'È'
@@ -106,13 +103,13 @@ compose '_' 'e' to '
  compose '_' 'i' to 'ï'
  compose '_' 'o' to 'ò'
  compose '_' 'u' to 'þ'
-compose '_' '¯' to '¯'
  compose 'a' 'e' to 'æ'
  compose 'n' 'g' to '¿'
-compose 'o' 's' to '§'
  compose 'o' 'x' to '¤'
  compose 's' '0' to '§'
+compose 's' 'o' to '§'
  compose 't' '-' to '¼'
+compose 'x' '0' to '¤'
  compose 'x' 'o' to '¤'
  compose '~' 'A' to 'Ã'
  compose '~' 'I' to '¥'
@@ -122,5 +119,3 @@ compose '~' 'a' to '
  compose '~' 'i' to 'µ'
  compose '~' 'o' to 'õ'
  compose '~' 'u' to 'ý'
-compose '°' 'A' to 'Å'
-compose '°' 'a' to 'å'
diff --git a/console-setup/compose.ISO-8859-7.inc b/console-setup/compose.ISO-8859-7.inc

index 98fc5b04f66ff3f8d5540579857dfb022c24668b..1aa936a8612e1358f80c1637635adbc3799708e6 100644 (file)
--- a/console-setup/compose.ISO-8859-7.inc
+++ b/console-setup/compose.ISO-8859-7.inc
@@ -2,10 +2,6 @@
  compose '!' '^' to '¦'
  compose '!' 's' to '§'
  compose '"' '"' to '¨'
-compose '"' 'É' to 'Ú'
-compose '"' 'Õ' to 'Û'
-compose '"' 'é' to 'ú'
-compose '"' 'õ' to 'û'
  compose '(' '(' to '['
  compose '(' '-' to '{'
  compose '(' 'c' to '©'
@@ -26,9 +22,7 @@ compose '.' '^' to '
  compose '/' '/' to '\\'
  compose '/' '<' to '\\'
  compose '/' '^' to '|'
-compose '0' 'c' to '©'
  compose '1' '2' to '½'
-compose '3' 's' to '³'
  compose '<' '/' to '\\'
  compose '<' '<' to '«'
  compose '<' '\'' to '¡'
@@ -38,20 +32,6 @@ compose '>' '\'' to '
  compose '\'' '<' to '¡'
  compose '\'' '>' to '¢'
  compose '\'' '\'' to '´'
-compose '\'' 'Á' to '¶'
-compose '\'' 'Å' to '¸'
-compose '\'' 'Ç' to '¹'
-compose '\'' 'É' to 'º'
-compose '\'' 'Ï' to '¼'
-compose '\'' 'Õ' to '¾'
-compose '\'' 'Ù' to '¿'
-compose '\'' 'á' to 'Ü'
-compose '\'' 'å' to 'Ý'
-compose '\'' 'ç' to 'Þ'
-compose '\'' 'é' to 'ß'
-compose '\'' 'ï' to 'ü'
-compose '\'' 'õ' to 'ý'
-compose '\'' 'ù' to 'þ'
  compose '^' '!' to '¦'
  compose '^' '.' to '·'
  compose '^' '/' to '|'
@@ -59,32 +39,14 @@ compose '^' '0' to '
  compose '^' '2' to '²'
  compose '^' '3' to '³'
  compose 'a' 't' to '@'
-compose 'b' 'v' to '¦'
  compose 'c' '0' to '©'
  compose 'c' 'o' to '©'
  compose 'o' 'c' to '©'
  compose 's' '0' to '§'
  compose 's' '2' to '²'
+compose 's' '3' to '³'
  compose 's' 'o' to '§'
  compose 'v' 'b' to '¦'
  compose 'v' 'l' to '|'
  compose '|' '|' to '¦'
  compose '~' '~' to '¯'
-compose 'Á' '\'' to '¶'
-compose 'Å' '\'' to '¸'
-compose 'Ç' '\'' to '¹'
-compose 'É' '"' to 'Ú'
-compose 'É' '\'' to 'º'
-compose 'Ï' '\'' to '¼'
-compose 'Õ' '"' to 'Û'
-compose 'Õ' '\'' to '¾'
-compose 'Ù' '\'' to '¿'
-compose 'á' '\'' to 'Ü'
-compose 'å' '\'' to 'Ý'
-compose 'ç' '\'' to 'Þ'
-compose 'é' '"' to 'ú'
-compose 'é' '\'' to 'ß'
-compose 'ï' '\'' to 'ü'
-compose 'õ' '"' to 'û'
-compose 'õ' '\'' to 'ý'
-compose 'ù' '\'' to 'þ'
diff --git a/console-setup/compose.ISO-8859-9.inc b/console-setup/compose.ISO-8859-9.inc

index f010dfc12dd148692c3328a51cc73a2d48b47f19..e642e1b71ff13c80ed3caab243d774de9fe86a31 100644 (file)
--- a/console-setup/compose.ISO-8859-9.inc
+++ b/console-setup/compose.ISO-8859-9.inc
@@ -62,9 +62,6 @@ compose '/' '^' to '|'
  compose '/' 'c' to '¢'
  compose '/' 'o' to 'ø'
  compose '/' 'u' to 'µ'
-compose '0' 's' to '§'
-compose '1' 's' to '¹'
-compose '2' 's' to '²'
  compose ':' '-' to '÷'
  compose '<' '/' to '\\'
  compose '<' '<' to '«'
@@ -138,10 +135,8 @@ compose 'a' 'e' to '
  compose 'c' '0' to '©'
  compose 'c' 'o' to '©'
  compose 'g' 'U' to 'ð'
-compose 'l' 'v' to '|'
  compose 'o' 'c' to '©'
  compose 'o' 'e' to '¼'
-compose 'o' 's' to '§'
  compose 'r' 'o' to '®'
  compose 's' '0' to '§'
  compose 's' '1' to '¹'
@@ -159,19 +154,3 @@ compose '~' 'O' to '
  compose '~' 'a' to 'ã'
  compose '~' 'n' to 'ñ'
  compose '~' 'o' to 'õ'
-compose '¨' 'A' to 'Ä'
-compose '¨' 'E' to 'Ë'
-compose '¨' 'I' to 'Ï'
-compose '¨' 'O' to 'Ö'
-compose '¨' 'U' to 'Ü'
-compose '¨' 'Y' to '¾'
-compose '¨' 'a' to 'ä'
-compose '¨' 'e' to 'ë'
-compose '¨' 'i' to 'ï'
-compose '¨' 'o' to 'ö'
-compose '¨' 'u' to 'ü'
-compose '¨' 'y' to 'ÿ'
-compose '°' 'A' to 'Å'
-compose '°' 'a' to 'å'
-compose '¸' 'S' to 'Þ'
-compose '¸' 's' to 'þ'
diff --git a/cron.d/anacron b/cron.d/anacron

index 1691ffe5978d0ce3cb86fd48e692a1b410e2f566..505b5c7c6ed3222b7cbb90768b98cf0911b70e1a 100644 (file)
--- a/cron.d/anacron
+++ b/cron.d/anacron
@@ -3,4 +3,4 @@
  SHELL=/bin/sh
  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
  
-30 7    * * *   root   test -x /etc/init.d/anacron && /usr/sbin/invoke-rc.d anacron start >/dev/null
+30 7    * * *   root   [ -x /etc/init.d/anacron ] && if [ ! -d /run/systemd/system ]; then /usr/sbin/invoke-rc.d anacron start >/dev/null; fi
diff --git a/cron.d/php b/cron.d/php

index 3628b342bc5d7387575599d102852f1f25689811..84e5d10da860aa496d2d3419a44c8cbc32ce1e64 100644 (file)
--- a/cron.d/php
+++ b/cron.d/php
@@ -11,4 +11,4 @@
  #  sessions yourself.
  
  # Look for and purge old sessions every 30 minutes
-09,39 *     * * *     root   [ -x /usr/lib/php/sessionclean ] && /usr/lib/php/sessionclean
+09,39 *     * * *     root   [ -x /usr/lib/php/sessionclean ] && if [ ! -d /run/systemd/system ]; then /usr/lib/php/sessionclean; fi
diff --git a/cron.daily/etckeeper b/cron.daily/etckeeper

index 5255691bc3d1717545b0f8e501a50b2f337d3902..eb74401a546ab260c9da88d207c005fc0e51880a 100755 (executable)
--- a/cron.daily/etckeeper
+++ b/cron.daily/etckeeper
@@ -1,19 +1,8 @@
  #!/bin/sh
  set -e
-if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
+if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
         . /etc/etckeeper/etckeeper.conf
         if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then
-               # avoid autocommit if an install run is in progress
-               lockfile=/var/cache/etckeeper/packagelist.pre-install
-               if [ -e "$lockfile" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then
-                       rm -f "$lockfile" # stale
-               fi
-               if [ ! -e "$lockfile" ]; then
-                       AVOID_SPECIAL_FILE_WARNING=1
-                       export AVOID_SPECIAL_FILE_WARNING
-                       if etckeeper unclean; then
-                               etckeeper commit "daily autocommit" >/dev/null
-                       fi
-               fi
+               /etc/etckeeper/daily
         fi
  fi
diff --git a/cron.daily/mlocate b/cron.daily/mlocate

index aeb1a88795d98531f32cf90bf9c11e547c3cb59a..331d063a5c0888f8aecd146e34588d89b8420b78 100755 (executable)
--- a/cron.daily/mlocate
+++ b/cron.daily/mlocate
@@ -18,4 +18,10 @@ if [ -x /usr/bin/ionice ] &&
      IONICE="/usr/bin/ionice -c3"
  fi
  
-flock --nonblock /run/mlocate.daily.lock $IONICE /usr/bin/updatedb.mlocate
+# See nocache(1)
+NOCACHE=
+if [ -x /usr/bin/nocache ]; then
+    NOCACHE="/usr/bin/nocache"
+fi
+
+flock --nonblock /run/mlocate.daily.lock $NOCACHE $IONICE /usr/bin/updatedb.mlocate
diff --git a/cron.daily/popularity-contest b/cron.daily/popularity-contest

index 2c1122fceb31b120d850bad8651ea07a8faae33e..0c14a95913d37fc149beac7fdfe482dc556c7654 100755 (executable)
--- a/cron.daily/popularity-contest
+++ b/cron.daily/popularity-contest
@@ -38,7 +38,8 @@ if [ -n "$HTTP_PROXY" ]; then
  fi
  
  POPCONOLD=/var/log/popularity-contest
-POPCON=/var/log/popularity-contest.new
+POPCONNEW=/var/log/popularity-contest.new
+POPCON="$POPCONNEW"
  
  # Only run on the given day, to spread the load on the server a bit
  if [ "$DAY" ] && [ "$DAY" != "$(date +%w)" ] ; then
@@ -85,8 +86,8 @@ run_popcon > $POPCON
  GPG=/usr/bin/gpg
  
  if [ "$ENCRYPT" = "yes" ] && ! [ -x "$GPG" ]; then
-  logger -t popularity-contest "encrytion required but gpg is not available."
-  echo "popularity-contest: encrytion required but gpg is not available." 2>&1
+  logger -t popularity-contest "encryption required but gpg is not available."
+  echo "popularity-contest: encryption required but gpg is not available." 2>&1
    exit 1
  fi
  
@@ -140,5 +141,5 @@ fi
  if [ "yes" != "$SUBMITTED" ] ; then
         logger -t popularity-contest "unable to submit report."
  else
-       mv $POPCON $POPCONOLD
+       mv $POPCONNEW $POPCONOLD
  fi
diff --git a/cron.monthly/ieee-data b/cron.monthly/ieee-data

deleted file mode 100755 (executable)

index 02978ad..0000000
--- a/cron.monthly/ieee-data
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-test -x /usr/bin/update-oui || exit 0
-BASEDIR=/var/lib/ieee-data/ /usr/bin/update-oui -f -q
diff --git a/cryptsetup-initramfs/conf-hook b/cryptsetup-initramfs/conf-hook

new file mode 100644 (file)

index 0000000..8d45160
--- /dev/null
+++ b/cryptsetup-initramfs/conf-hook
@@ -0,0 +1,34 @@
+#
+# Configuration file for the cryptroot initramfs hook.
+#
+
+#
+# CRYPTSETUP: [ y | n ]
+#
+# Add cryptsetup modules to the initramfs image, regardless of _this_
+# machine configuration.  By default, cryptsetup modules are only added
+# when there is a device that needs to be unlocked at initramfs stage
+# (such as root or resume devices).
+#
+
+#CRYPTSETUP=
+
+#
+# KEYFILE_PATTERN: ...
+#
+# The value of this variable is interpreted as a shell pattern.
+# Matching key files from the crypttab(5) are included in the initramfs
+# image.  The associated devices can then be unlocked without manual
+# intervention.  (For instance if /etc/crypttab lists two key files
+# /etc/keys/{root,swap}.key, you can set KEYFILE_PATTERN="/etc/keys/*.key"
+# to add them to the initrd.)
+#
+# Setting KEYFILE_PATTERN to a non-empty value implies "CRYPTSETUP=y".
+#
+# WARNING: If the initramfs image is to include private key material,
+# you'll want to create it with a restrictive umask in order to keep
+# non-privileged users at bay.  For instance, set UMASK=0077 in
+# /etc/initramfs-tools/initramfs.conf
+#
+
+#KEYFILE_PATTERN=
diff --git a/cupshelpers/preferreddrivers.xml b/cupshelpers/preferreddrivers.xml

index 666fb6d00810dc4613933be2818c8cdd9bf3866c..68269bf881bd08ac25646a46768620416f70d379 100644 (file)
--- a/cupshelpers/preferreddrivers.xml
+++ b/cupshelpers/preferreddrivers.xml
@@ -83,6 +83,10 @@
      <!-- END OF GENERIC DRIVERS -->
      <!-- now fit is either exact-cmd, exact, or close -->
  
+    <drivertype name="driverless">
+      <ppdname match="driverless:"/>
+    </drivertype>
+
      <drivertype name="cups">
        <ppdname match="drv:///sample.drv/"/>
      </drivertype>
@@ -263,9 +267,36 @@
        </avoid>
      </printer>
  
+    <!--
+      We need driver for CLP-310 but there are other CLP-315 which are preferred because their drivertype is higher
+      in the preferenceorder.
+      Driver for CLP-310 provides drivertype "splix" and "foomatic" so others which are higher in preferenceorder
+      must be placed here.
+    -->
+    <printer>
+      <make-and-model match="Samsung CLP 310" />
+      <deviceid>
+        <field name="MFG" match="Samsung" />
+        <field name="MDL" match="CLP-310 Series" />
+      </deviceid>
+      <avoid>
+        <drivertype>manufacturer-cmd</drivertype>
+        <drivertype>foomatic-recommended-nonpostscript</drivertype>
+        <drivertype>manufacturer*</drivertype>
+        <drivertype>pdf</drivertype>
+        <drivertype>foomatic-recommended-postscript</drivertype>
+        <drivertype>hpcups</drivertype>
+        <drivertype>foomatic-postscript</drivertype>
+        <drivertype>gutenprint-simplified</drivertype>
+        <drivertype>gutenprint-expert</drivertype>
+        <drivertype>foomatic-gutenprint</drivertype>
+      </avoid>
+    </printer>
+
      <printer>
        <!-- For all printers -->
        <drivers>
+       <drivertype>driverless</drivertype>
         <drivertype>manufacturer-cmd</drivertype>
         <drivertype>foomatic-recommended-nonpostscript</drivertype>
         <drivertype>manufacturer*</drivertype>
diff --git a/dbus-1/system.d/org.opensuse.CupsPkHelper.Mechanism.conf b/dbus-1/system.d/org.opensuse.CupsPkHelper.Mechanism.conf

index 4068ede0d8e2b15a21e1a246f7371792b3b66bd5..6b246eb2767a42b27a3bc0db0a8920ad99249b09 100644 (file)
--- a/dbus-1/system.d/org.opensuse.CupsPkHelper.Mechanism.conf
+++ b/dbus-1/system.d/org.opensuse.CupsPkHelper.Mechanism.conf
@@ -6,7 +6,7 @@
  <busconfig>
  
    <!-- Only root can own the service -->
-  <policy user="root">
+  <policy user="cups-pk-helper">
      <allow own="org.opensuse.CupsPkHelper.Mechanism"/>
    </policy>
  
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/cron b/default/cron

index d22d01cce59c652d19618fb5d8a8ae6bbe1d51c7..bba2e52aaa4a78e5663c3f23c53c233616bcf0e9 100644 (file)
--- a/default/cron
+++ b/default/cron
@@ -1,3 +1,4 @@
-# This file has been deprecated. Please add custom options for cron to
-# /etc/init/cron.conf and/or /etc/init/cron.override directly. See
-# the init(5) man page for more information.
+# This file has been deprecated. Please add custom options for cron using
+# $ systemctl edit cron.service
+# or
+# $ systemctl edit --full cron.service
diff --git a/default/im-config b/default/im-config

index 646863f93d4ae998531d72dc844a0dad04dc4287..4e7a6b99b41e90cb0de68ab863ab70300ea96a49 100644 (file)
--- a/default/im-config
+++ b/default/im-config
@@ -1,6 +1,16 @@
  # Default im-config mode (see im-config(8))
  
-if [ "$XDG_CURRENT_DESKTOP" = 'Unity' -o "$XDG_CURRENT_DESKTOP" = 'MATE' -o "${XDG_CURRENT_DESKTOP##*:}" = 'GNOME' ]; then
+OLDIFS="$IFS"
+IFS=':'
+desktop=
+for val in $XDG_CURRENT_DESKTOP; do
+    for d in 'Unity' 'MATE' 'GNOME'; do
+        [ "$d" = "$val" ] && { desktop="$d"; break 2; }
+    done
+done
+IFS="$OLDIFS"
+
+if [ -n "$desktop" ]; then
      # Start best input method unless overridden below
      IM_CONFIG_DEFAULT_MODE=auto
  else
@@ -9,7 +19,7 @@ else
  fi
  
  # Set locale dependent preferred IM over standard auto mode
-if [ "${XDG_CURRENT_DESKTOP##*:}" != 'GNOME' -a "${XDG_CURRENT_DESKTOP%%:*}" != 'GNOME-Flashback' ]; then
+if [ "$desktop" != 'GNOME' -a "${XDG_CURRENT_DESKTOP%%:*}" != 'GNOME-Flashback' ]; then
      IM_CONFIG_PREFERRED_RULE="zh_CN,fcitx:zh_TW,fcitx:zh_HK,fcitx:zh_SG,fcitx:ja_JP,fcitx:ko_KR,fcitx:vi_VN,fcitx"
  fi
  
diff --git a/default/irqbalance b/default/irqbalance

index 3280858d5b912231be4d14c70a59547bf04e3bf5..bd87e3dace0587d2976046f9ebb575dda143f1c8 100644 (file)
--- a/default/irqbalance
+++ b/default/irqbalance
@@ -1,6 +1,26 @@
-#Configuration for the irqbalance daemon
+# irqbalance is a daemon process that distributes interrupts across
+# CPUS on SMP systems.  The default is to rebalance once every 10
+# seconds.  This is the environment file that is specified to systemd via the 
+# EnvironmentFile key in the service unit file (or via whatever method the init
+# system you're using has. 
+#
+# ONESHOT=yes
+#    after starting, wait for a minute, then look at the interrupt
+#    load and balance it once; after balancing exit and do not change
+#    it again.
+#IRQBALANCE_ONESHOT=
  
-#Should irqbalance be enabled?
-ENABLED="1"
-#Balance the IRQs only once?
-ONESHOT="0"
+#
+# IRQBALANCE_BANNED_CPUS
+#    64 bit bitmask which allows you to indicate which cpu's should
+#    be skipped when reblancing irqs.  Cpu numbers which have their 
+#    corresponding bits set to one in this mask will not have any
+#    irq's assigned to them on rebalance
+#
+#IRQBALANCE_BANNED_CPUS=
+
+#
+# IRQBALANCE_ARGS
+#    append any args here to the irqbalance daemon as documented in the man page
+#
+#IRQBALANCE_ARGS=
diff --git a/default/motd-news b/default/motd-news

new file mode 100644 (file)

index 0000000..434e562
--- /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=1
+
+# 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/default/rsync b/default/rsync

index 13780c2dbef974ecbd92a97fb17c39dd97e55509..424b1c0f75932c0f6d832f08b870b1762f56ceb6 100644 (file)
--- a/default/rsync
+++ b/default/rsync
@@ -1,4 +1,10 @@
  # defaults file for rsync daemon mode
+#
+# This file is only used for init.d based systems!
+# If this system uses systemd, you can specify options etc. for rsync
+# in daemon mode by copying /lib/systemd/system/rsync.service to
+# /etc/systemd/system/rsync.service and modifying the copy; add required
+# options to the ExecStart line.
  
  # start rsync in daemon mode from init.d script?
  #  only allowed values are "true", "false", and "inetd"
diff --git a/dhcp/dhclient-enter-hooks.d/avahi-autoipd b/dhcp/dhclient-enter-hooks.d/avahi-autoipd

index fba3eb3d8f82aa262a6aafe935d24f7a36d93dc6..738fa3578f60312fa4e3c84951356154d207dbf0 100755 (executable)
--- a/dhcp/dhclient-enter-hooks.d/avahi-autoipd
+++ b/dhcp/dhclient-enter-hooks.d/avahi-autoipd
@@ -22,7 +22,9 @@ case "$reason" in
          ;;
  
      PREINIT|BOUND|RENEW|REBIND|REBOOT|STOP|RELEASE)
-        /usr/sbin/avahi-autoipd -k $interface 2> /dev/null
+        if [ -x /usr/sbin/avahi-autoipd ] && /usr/sbin/avahi-autoipd -c $interface; then
+            /usr/sbin/avahi-autoipd -k $interface 2> /dev/null
+        fi
          ;;
      
      EXPIRE|FAIL|TIMEOUT)
diff --git a/dhcp/dhclient-exit-hooks.d/zzz_avahi-autoipd b/dhcp/dhclient-exit-hooks.d/zzz_avahi-autoipd

index 96cf494341cf550a6e658417a9f97aabb0ef2b97..8d3f4a3929d6f9ffbeb873ca9625291a18bff321 100755 (executable)
--- a/dhcp/dhclient-exit-hooks.d/zzz_avahi-autoipd
+++ b/dhcp/dhclient-exit-hooks.d/zzz_avahi-autoipd
@@ -26,6 +26,8 @@ case "$reason" in
          ;;
  
      EXPIRE|FAIL|TIMEOUT)
-        /usr/sbin/avahi-autoipd -wD $interface 2> /dev/null
+        if [ -x /usr/sbin/avahi-autoipd ] ; then
+            /usr/sbin/avahi-autoipd -wD $interface 2> /dev/null
+        fi
          ;;
  esac
diff --git a/dkms/framework.conf b/dkms/framework.conf

index fd2cf57ffae00000ba97348a544df9a99bcc1728..852f3b7cf24f692a161ec18ab46dc1297bc1d9c2 100644 (file)
--- a/dkms/framework.conf
+++ b/dkms/framework.conf
@@ -16,3 +16,13 @@
  
  ## verbosity setting (verbose will be active if you set it to a non-null value)
  # verbose=""
+
+## symlink kernel modules (will be active if you set it to a non-null value)
+## This creates symlinks from the install_tree into the dkms_tree instead of
+## copying the modules. This preserves some space on the costs of being less
+## safe.
+# symlink_modules=""
+
+## Automatic installation and upgrade for all installed kernels (if set to a
+## non-null value)
+# autoinstall_all_kernels=""
diff --git a/dkms/template-dkms-mkbmdeb/Makefile b/dkms/template-dkms-mkbmdeb/Makefile

new file mode 100644 (file)

index 0000000..210b998
--- /dev/null
+++ b/dkms/template-dkms-mkbmdeb/Makefile
@@ -0,0 +1,18 @@
+#/usr/bin/make
+SRC = $(DESTDIR)/usr/src
+SHARE = $(DESTDIR)/usr/share/$(NAME)-dkms
+
+all:
+
+clean:
+
+install:
+
+#tarball, possibly with binaries
+ifeq ("$(wildcard $(NAME)-$(VERSION).dkms.tar.gz)", "$(NAME)-$(VERSION).dkms.tar.gz")
+       tar zxvf "$(NAME)-$(VERSION).dkms.tar.gz"
+       install -d "$(DESTDIR)/lib/modules/$(KVER)/updates/dkms/"
+       install -m 644 dkms_main_tree/$(KVER)/$(KARCH)/module/*.ko "$(DESTDIR)/lib/modules/$(KVER)/updates/dkms/"
+       rm -rf dkms_main_tree/ dkms_binaries_only/
+endif
+
diff --git a/dkms/template-dkms-mkbmdeb/debian/README.Debian b/dkms/template-dkms-mkbmdeb/debian/README.Debian

new file mode 100644 (file)

index 0000000..f8495d9
--- /dev/null
+++ b/dkms/template-dkms-mkbmdeb/debian/README.Debian
@@ -0,0 +1,5 @@
+MODULE_NAME DKMS module for Debian
+
+This package was automatically generated by the DKMS system,
+for distribution on Debian based operating systems.
+
diff --git a/dkms/template-dkms-mkbmdeb/debian/changelog b/dkms/template-dkms-mkbmdeb/debian/changelog

new file mode 100644 (file)

index 0000000..b6cc91d
--- /dev/null
+++ b/dkms/template-dkms-mkbmdeb/debian/changelog
@@ -0,0 +1,6 @@
+DEBIAN_PACKAGE-dkms-bin (MODULE_VERSION) stable; urgency=low
+
+  * Automatically packaged by DKMS.
+
+ -- Dynamic Kernel Modules Support Team <pkg-dkms-maint@lists.alioth.debian.org>  DATE_STAMP
+
diff --git a/dkms/template-dkms-mkbmdeb/debian/compat b/dkms/template-dkms-mkbmdeb/debian/compat

new file mode 100644 (file)

index 0000000..7f8f011
--- /dev/null
+++ b/dkms/template-dkms-mkbmdeb/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/dkms/template-dkms-mkbmdeb/debian/control b/dkms/template-dkms-mkbmdeb/debian/control

new file mode 100644 (file)

index 0000000..ef23975
--- /dev/null
+++ b/dkms/template-dkms-mkbmdeb/debian/control
@@ -0,0 +1,14 @@
+Source: DEBIAN_PACKAGE-dkms-bin
+Section: misc
+Priority: optional
+Maintainer: Dynamic Kernel Modules Support Team <pkg-dkms-maint@lists.alioth.debian.org>
+Build-Depends: debhelper (>= 7), dkms
+Standards-Version: 3.8.1
+
+Package: DEBIAN_PACKAGE-modules-KERNEL_VERSION
+Architecture: DEBIAN_BUILD_ARCH
+Depends: ${misc:Depends}, linux-image-KERNEL_VERSION
+Provides: DEBIAN_PACKAGE-modules
+Description: DEBIAN_PACKAGE binary drivers for linux-image-KERNEL_VERSION
+ This package contains DEBIAN_PACKAGE drivers for the KERNEL_VERSION Linux kernel,
+ built from DEBIAN_PACKAGE-dkms for the DEBIAN_BUILD_ARCH architecture.
diff --git a/dkms/template-dkms-mkbmdeb/debian/copyright b/dkms/template-dkms-mkbmdeb/debian/copyright

new file mode 100644 (file)

index 0000000..ad983f3
--- /dev/null
+++ b/dkms/template-dkms-mkbmdeb/debian/copyright
@@ -0,0 +1,2 @@
+
+This copyright has not been completed by the author of this package.
diff --git a/dkms/template-dkms-mkbmdeb/debian/rules b/dkms/template-dkms-mkbmdeb/debian/rules

new file mode 100755 (executable)

index 0000000..5cd0731
--- /dev/null
+++ b/dkms/template-dkms-mkbmdeb/debian/rules
@@ -0,0 +1,58 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEB_NAME=DEBIAN_PACKAGE
+NAME=MODULE_NAME
+VERSION=MODULE_VERSION
+KVER=KERNEL_VERSION
+
+configure: configure-stamp
+configure-stamp:
+       dh_testdir
+       touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+       dh_testdir
+       $(MAKE)
+       touch $@
+
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp configure-stamp
+       -$(MAKE) clean
+       dh_clean
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_prep
+       dh_installdirs
+       $(MAKE) DESTDIR=$(CURDIR)/debian/$(DEB_NAME)-modules-$(KVER) NAME=$(NAME) VERSION=$(VERSION) install
+
+binary-arch: build install
+
+binary-indep: build install
+       dh_testdir
+       dh_testroot
+       dh_link
+       dh_strip
+       dh_compress
+       dh_installmodules
+       dh_installdocs
+       dh_installchangelogs
+       dh_fixperms
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/dkms/template-dkms-mkdeb/debian/control b/dkms/template-dkms-mkdeb/debian/control

index e561c006952d57ee80b3be5160303d3eaa838ea7..1fe029a4014f3c9c194e4ab018cf83bad57c1960 100644 (file)
--- a/dkms/template-dkms-mkdeb/debian/control
+++ b/dkms/template-dkms-mkdeb/debian/control
@@ -6,6 +6,6 @@ Build-Depends: debhelper (>= 7), dkms
  Standards-Version: 3.8.1
  
  Package: DEBIAN_PACKAGE-dkms
-Architecture: all
+Architecture: DEBIAN_BUILD_ARCH
  Depends: dkms (>= 1.95), ${misc:Depends}
  Description: DEBIAN_PACKAGE driver in DKMS format.
diff --git a/etckeeper/commit.d/20store-metadata b/etckeeper/commit.d/20store-metadata

new file mode 120000 (symlink)

index 0000000..5698d64
--- /dev/null
+++ b/etckeeper/commit.d/20store-metadata
@@ -0,0 +1 @@
+../pre-commit.d/30store-metadata
+\ No newline at end of file
diff --git a/etckeeper/commit.d/50vcs-commit b/etckeeper/commit.d/50vcs-commit

index 569ba6cf34f7896499394e7665268a957d1269f3..55f0db2440abcd6a7756e0d93d98b71af2324758 100755 (executable)
--- a/etckeeper/commit.d/50vcs-commit
+++ b/etckeeper/commit.d/50vcs-commit
@@ -55,11 +55,23 @@ if [ "$VCS" = git ] && [ -d .git ]; then
                                 export GIT_AUTHOR_EMAIL
                         fi
                 fi
+               if [ -z "$GIT_AUTHOR_NAME" ] || [ -z "$GIT_AUTHOR_EMAIL" ]; then
+                       if [ -n "$USER_HOME" ] && [ -e "$USER_HOME/.config/git/config" ]; then
+                               if [ -z "$GIT_AUTHOR_NAME" ]; then
+                                       GIT_AUTHOR_NAME="$(git config -f "$USER_HOME/.config/git/config" user.name)" || true
+                                       export GIT_AUTHOR_NAME
+                               fi
+                               if [ -z "$GIT_AUTHOR_EMAIL" ]; then
+                                       GIT_AUTHOR_EMAIL="$(git config -f "$USER_HOME/.config/git/config" user.email)" || true
+                                       export GIT_AUTHOR_EMAIL
+                               fi
+                       fi
+               fi
+
                 if [ -z "$GIT_COMMITTER_EMAIL" ]; then
                         GIT_COMMITTER_EMAIL="$(git config --global user.email)" || true
                         export GIT_COMMITTER_EMAIL
                 fi
-
                 if [ -z "$GIT_AUTHOR_NAME" ]; then
                         GIT_AUTHOR_NAME="$USER"
                         export GIT_AUTHOR_NAME
@@ -97,7 +109,7 @@ elif [ "$VCS" = bzr ] && [ -d .bzr ]; then
                 EMAIL="$USER <$USER@$hostname>"
                 export EMAIL
         else
-               bzr whoami || export EMAIL="$ORIG_USER <$ORIG_USER@$hostname>"
+               bzr whoami >/dev/null 2>&1 || export EMAIL="$ORIG_USER <$ORIG_USER@$hostname>"
         fi
         if [ -n "$logfile" ]; then
                 bzr commit $BZR_COMMIT_OPTIONS -F "$logfile"
diff --git a/etckeeper/daily b/etckeeper/daily

new file mode 100755 (executable)

index 0000000..f98c6ad
--- /dev/null
+++ b/etckeeper/daily
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Script that can be run daily to autocommit /etc changes.
+set -e
+if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
+       # avoid autocommit if an install run is in progress
+       lockfile=/var/cache/etckeeper/packagelist.pre-install
+       if [ -e "$lockfile" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then
+               rm -f "$lockfile" # stale
+       fi
+       if [ ! -e "$lockfile" ]; then
+               AVOID_SPECIAL_FILE_WARNING=1
+               export AVOID_SPECIAL_FILE_WARNING
+               if etckeeper unclean; then
+                       etckeeper commit "daily autocommit" >/dev/null
+               fi
+       fi
+fi
diff --git a/etckeeper/list-installed.d/50list-installed b/etckeeper/list-installed.d/50list-installed

index 4a8ce708b899a4e5df5a8cc510c301d5adaf012c..129447f9876385f34bc844fcc1c5ba5acfbd1538 100755 (executable)
--- a/etckeeper/list-installed.d/50list-installed
+++ b/etckeeper/list-installed.d/50list-installed
@@ -17,6 +17,8 @@ else
                 rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
         elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then
                 pacman -Q
+       elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacmatic ]; then
+               pacmatic -Q
         elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pkgng ]; then
                 pkg info -E "*"
         fi
diff --git a/etckeeper/pre-commit.d/20warn-problem-files b/etckeeper/pre-commit.d/20warn-problem-files

index f28d5ac6139a1e7a9c6278ebc988932115d133ee..4ffbfd187b206b1a58946e726d237b1a3304dfcf 100755 (executable)
--- a/etckeeper/pre-commit.d/20warn-problem-files
+++ b/etckeeper/pre-commit.d/20warn-problem-files
@@ -12,8 +12,8 @@ elif [ "$VCS" = hg ]; then
         special=$(find . ! -type d ! -type f ! -type l | exclude_internal) || true
         hardlinks=$(find . -type f ! -links 1 -exec hg status {} \; | exclude_internal ) || true
  elif [ "$VCS" = git ]; then
-       special=$(find . ! -type d ! -type f ! -type l -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true
-       hardlinks=$(find . -type f ! -links 1 -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true
+       special=$(find . ! -type d ! -type f ! -type l -exec git ls-files --exclude-standard --cached --others {} + | exclude_internal) || true
+       hardlinks=$(find . -type f ! -links 1 -exec git ls-files --exclude-standard --cached --others {} + | exclude_internal) || true
  else
         special=""
  fi
diff --git a/etckeeper/pre-commit.d/30store-metadata b/etckeeper/pre-commit.d/30store-metadata

index edec06b688726c8498397114a1d767ebc0b63690..2b77c8eda970c6b702f8426d31d0510505e464f8 100755 (executable)
--- a/etckeeper/pre-commit.d/30store-metadata
+++ b/etckeeper/pre-commit.d/30store-metadata
@@ -1,19 +1,6 @@
  #!/bin/sh
  set -e
  
-# Filters out UNKNOWN users and groups, prints a warning on stderr.
-filter_unknown() {
-       CMD=$1
-       while read line; do
-               # if the first n chars of $line equal "$CMD UNKNOWN "...
-               if [ "$(printf %.$((9+${#CMD}))s "$line")" = "$CMD UNKNOWN " ]; then
-                       echo Bad "$2" for "$line" >&2
-               else
-                       echo "$line"
-               fi
-       done
-}
-
  filter_ignore() {
         case "$VCS" in
                 darcs) ignorefile=.darcsignore ;;
diff --git a/etckeeper/update-ignore.d/01update-ignore b/etckeeper/update-ignore.d/01update-ignore

index 098fab8a672f4c0638e7014c908648e9df373ff0..73472878587f2d1df117bad451ca0cc74a4ad37a 100755 (executable)
--- a/etckeeper/update-ignore.d/01update-ignore
+++ b/etckeeper/update-ignore.d/01update-ignore
@@ -93,7 +93,7 @@ writefile () {
                 comment "new and old versions of conffiles, stored by apt/rpm"
                 ignore "*.rpm*"
                 nl
-       elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "pacman-g2" -o "$LOWLEVEL_PACKAGE_MANAGER" = "pacman" ]; then
+       elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "pacman-g2" -o "$LOWLEVEL_PACKAGE_MANAGER" = "pacman" -o "$LOWLEVEL_PACKAGE_MANAGER" = "pacmatic" ]; then
                 comment "new and old versions of conffiles, stored by pacman"
                 ignore "*.pacnew"
                 ignore "*.pacorig"
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-cjk-aliases.conf b/fonts/conf.avail/30-cjk-aliases.conf

index 0ce3fe8f120ed4cca50ea9b840813d107b0dcce3..497d2bfc7164053306b96a85a1b0117d42d71ad8 100644 (file)
--- a/fonts/conf.avail/30-cjk-aliases.conf
+++ b/fonts/conf.avail/30-cjk-aliases.conf
@@ -5,6 +5,7 @@
      <alias>
          <family>Batang</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
             <family>NanumMyeongjo</family>
              <family>UnBatang</family>
          </accept>
@@ -12,6 +13,7 @@
      <alias>
          <family>바탕</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
             <family>NanumMyeongjo</family>
              <family>UnBatang</family>
          </accept>
@@ -19,6 +21,7 @@
      <alias>
          <family>BatangChe</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
             <family>NanumMyeongjo</family>
              <family>UnBatang</family>
          </accept>
@@ -26,6 +29,7 @@
      <alias>
          <family>바탕체</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
             <family>NanumMyeongjo</family>
              <family>UnBatang</family>
          </accept>
@@ -33,6 +37,7 @@
      <alias>
         <family>Myeongjo</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
             <family>NanumMyeongjo</family>
              <family>UnBatang</family>
          </accept>
@@ -40,6 +45,7 @@
      <alias>
          <family>명조</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
             <family>NanumMyeongjo</family>
              <family>UnBatang</family>
          </accept>
@@ -47,6 +53,7 @@
      <alias>
          <family>MyeongjoChe</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
             <family>NanumMyeongjo</family>
              <family>UnBatang</family>
          </accept>
@@ -54,6 +61,7 @@
      <alias>
          <family>명조체</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
             <family>NanumMyeongjo</family>
              <family>UnBatang</family>
          </accept>
@@ -61,6 +69,7 @@
      <alias>
          <family>AR MingtiM KSC</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
             <family>NanumMyeongjo</family>
              <family>UnBatang</family>
          </accept>
@@ -68,6 +77,7 @@
      <alias>
          <family>Adobe 명조 Std M</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
             <family>NanumMyeongjo</family>
              <family>UnBatang</family>
          </accept>
@@ -75,6 +85,7 @@
      <alias>
          <family>Adobe Myeongjo Std M</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
             <family>NanumMyeongjo</family>
              <family>UnBatang</family>
          </accept>
@@ -82,6 +93,7 @@
      <alias>
          <family>Gungsuh</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
              <family>UnGungseo</family> 
             <family>NanumMyeongjo</family>
          </accept>
@@ -89,6 +101,7 @@
      <alias>
          <family>궁서</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
              <family>UnGungseo</family> 
             <family>NanumMyeongjo</family>
          </accept>
@@ -96,6 +109,7 @@
      <alias>
          <family>GungsuhChe</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
              <family>UnGungseo</family> 
             <family>NanumMyeongjo</family>
          </accept>
@@ -103,6 +117,7 @@
      <alias>
          <family>궁서체</family>
          <accept>
+           <family>Noto Serif CJK KR</family>
              <family>UnGungseo</family> 
             <family>NanumMyeongjo</family>
          </accept>
@@ -110,6 +125,7 @@
      <alias>
          <family>Dotum</family>
          <accept>
+           <family>Noto Sans CJK KR</family>
             <family>NanumGothic</family>
              <family>UnDotum</family>
          </accept>
@@ -117,6 +133,7 @@
      <alias>
          <family>돋움</family>
          <accept>
+           <family>Noto Sans CJK KR</family>
             <family>NanumGothic</family>
              <family>UnDotum</family>
          </accept>
@@ -124,6 +141,7 @@
      <alias>
          <family>Gothic</family>
          <accept>
+           <family>Noto Sans CJK KR</family>
             <family>NanumGothic</family>
              <family>UnDotum</family>
          </accept>
@@ -131,6 +149,7 @@
      <alias>
          <family>고딕</family>
          <accept>
+           <family>Noto Sans CJK KR</family>
             <family>NanumGothic</family>
              <family>UnDotum</family>
          </accept>
@@ -138,6 +157,7 @@
      <alias>
         <family>Malgun Gothic</family>
          <accept>
+           <family>Noto Sans CJK KR</family>
             <family>NanumGothic</family>
              <family>UnDotum</family>
          </accept>
@@ -145,6 +165,7 @@
      <alias>
          <family>맑은 고딕</family>
          <accept>
+           <family>Noto Sans CJK KR</family>
             <family>NanumGothic</family>
              <family>UnDotum</family>
          </accept>
@@ -152,6 +173,7 @@
      <alias>
         <family>Gulim</family>
          <accept>
+           <family>Noto Sans CJK KR</family>
             <family>NanumGothic</family>
              <family>UnDotum</family>
          </accept>
@@ -159,6 +181,7 @@
      <alias>
          <family>굴림</family>
          <accept>
+           <family>Noto Sans CJK KR</family>
             <family>NanumGothic</family>
              <family>UnDotum</family>
          </accept>
@@ -166,6 +189,7 @@
      <alias>
         <family>AppleGothic</family>
          <accept>
+           <family>Noto Sans CJK KR</family>
             <family>NanumGothic</family>
              <family>UnDotum</family>
          </accept>
@@ -173,6 +197,7 @@
      <alias>
          <family>애플고딕</family>
          <accept>
+           <family>Noto Sans CJK KR</family>
             <family>NanumGothic</family>
              <family>UnDotum</family>
          </accept>
@@ -180,6 +205,7 @@
      <alias>
          <family>DotumChe</family>
          <accept>
+           <family>Noto Sans Mono CJK KR</family>
             <family>NanumGothicCoding</family>
             <family>NanumGothic</family>
          </accept>
@@ -187,6 +213,7 @@
      <alias>
          <family>돋움체</family>
          <accept>
+           <family>Noto Sans Mono CJK KR</family>
             <family>NanumGothicCoding</family>
             <family>NanumGothic</family>
          </accept>
@@ -194,6 +221,7 @@
      <alias>
          <family>GothicChe</family>
          <accept>
+           <family>Noto Sans Mono CJK KR</family>
             <family>NanumGothicCoding</family>
             <family>NanumGothic</family>
          </accept>
@@ -201,6 +229,7 @@
      <alias>
          <family>고딕체</family>
          <accept>
+           <family>Noto Sans Mono CJK KR</family>
             <family>NanumGothicCoding</family>
             <family>NanumGothic</family>
          </accept>
@@ -208,6 +237,7 @@
      <alias>
          <family>GulimChe</family>
          <accept>
+           <family>Noto Sans Mono CJK KR</family>
             <family>NanumGothicCoding</family>
             <family>NanumGothic</family>
          </accept>
@@ -215,6 +245,7 @@
      <alias>
          <family>굴림체</family>
          <accept>
+           <family>Noto Sans Mono CJK KR</family>
             <family>NanumGothicCoding</family>
             <family>NanumGothic</family>
          </accept>
@@ -223,6 +254,7 @@
      <alias>
          <family>MS Gothic</family>
          <accept>
+            <family>Noto Sans Mono CJK JP</family>
              <family>TakaoGothic</family>
              <family>IPAGothic</family>
              <family>IPAMonaGothic</family>
@@ -234,6 +266,7 @@
      <alias>
          <family>ＭＳ ゴシック</family>
          <accept>
+            <family>Noto Sans Mono CJK JP</family>
              <family>TakaoGothic</family>
              <family>IPAGothic</family>
              <family>IPAMonaGothic</family>
@@ -245,6 +278,7 @@
      <alias>
          <family>MS PGothic</family>
          <accept>
+            <family>Noto Sans CJK JP</family>
              <family>IPAMonaPGothic</family>
              <family>TakaoPGothic</family>
              <family>IPAPGothic</family>
@@ -256,6 +290,7 @@
      <alias>
          <family>ＭＳ Ｐゴシック</family>
          <accept>
+            <family>Noto Sans CJK JP</family>
              <family>IPAMonaPGothic</family>
              <family>TakaoPGothic</family>
              <family>IPAPGothic</family>
@@ -267,6 +302,7 @@
      <alias>
          <family>MS UIGothic</family>
          <accept>
+            <family>Noto Sans CJK JP</family>
              <family>IPAMonaPGothic</family>
              <family>TakaoPGothic</family>
              <family>IPAPGothic</family>
@@ -278,6 +314,7 @@
      <alias>
          <family>Meiryo UI</family>
          <accept>
+            <family>Noto Sans CJK JP</family>
              <family>IPAMonaPGothic</family>
              <family>TakaoPGothic</family>
              <family>IPAPGothic</family>
@@ -289,6 +326,7 @@
      <alias>
          <family>MS Mincho</family>
          <accept>
+            <family>Noto Serif CJK JP</family>
              <family>TakaoMincho</family>
              <family>IPAMincho</family>
              <family>IPAMonaMincho</family>
@@ -299,6 +337,7 @@
      <alias>
          <family>ＭＳ 明朝</family>
          <accept>
+            <family>Noto Serif CJK JP</family>
              <family>TakaoMincho</family>
              <family>IPAMincho</family>
              <family>IPAMonaMincho</family>
@@ -309,6 +348,7 @@
      <alias>
          <family>AR MinchoL JIS</family>
          <accept>
+            <family>Noto Serif CJK JP</family>
              <family>TakaoMincho</family>
              <family>IPAMincho</family>
              <family>IPAMonaMincho</family>
@@ -319,6 +359,7 @@
      <alias>
          <family>MS PMincho</family>
          <accept>
+            <family>Noto Serif CJK JP</family>
              <family>IPAMonaPMincho</family>
              <family>TakaoPMincho</family>
              <family>IPAPMincho</family>
@@ -329,6 +370,7 @@
      <alias>
          <family>ＭＳ Ｐ明朝</family>
          <accept>
+            <family>Noto Serif CJK JP</family>
              <family>IPAMonaPMincho</family>
              <family>TakaoPMincho</family>
              <family>IPAPMincho</family>
@@ -352,6 +394,7 @@
      <alias>
          <family>SimSun</family>
          <accept>
+            <family>Noto Serif CJK SC</family>
              <family>HYSong</family>
              <family>AR PL UMing CN</family>
          </accept>
@@ -359,6 +402,7 @@
      <alias>
          <family>NSimSun</family>
          <accept>
+            <family>Noto Serif CJK SC</family>
              <family>HYSong</family>
              <family>AR PL UMing CN</family>
          </accept>
@@ -366,6 +410,7 @@
      <alias>
          <family>SimSun-18030</family>
          <accept>
+            <family>Noto Serif CJK SC</family>
              <family>HYSong</family>
              <family>AR PL UMing CN</family>
          </accept>
@@ -373,6 +418,7 @@
      <alias>
          <family>NSimSun-18030</family>
          <accept>
+            <family>Noto Serif CJK SC</family>
              <family>HYSong</family>
              <family>AR PL UMing CN</family>
          </accept>
@@ -380,6 +426,7 @@
      <alias>
          <family>宋体</family>
          <accept>
+            <family>Noto Serif CJK SC</family>
              <family>HYSong</family>
              <family>AR PL UMing CN</family>
          </accept>
@@ -387,6 +434,7 @@
      <alias>
          <family>新宋体</family>
          <accept>
+            <family>Noto Serif CJK SC</family>
              <family>HYSong</family>
              <family>AR PL UMing CN</family>
          </accept>
@@ -394,6 +442,7 @@
      <alias>
          <family>AR MingtiM GB</family>
          <accept>
+            <family>Noto Serif CJK SC</family>
              <family>HYSong</family>
              <family>AR PL UMing CN</family>
          </accept>
@@ -401,6 +450,7 @@
      <alias>
          <family>KaiTi</family>
          <accept>
+            <family>Noto Serif CJK SC</family>
              <family>AR PL UKai CN</family>
              <family>AR PL ZenKai Uni</family>
          </accept>
@@ -408,6 +458,7 @@
      <alias>
          <family>楷体</family>
          <accept>
+            <family>Noto Serif CJK SC</family>
              <family>AR PL UKai CN</family>
              <family>AR PL ZenKai Uni</family>
          </accept>
@@ -432,36 +483,42 @@
      <alias>
          <family>MingLiU</family>
          <accept>
+            <family>Noto Serif CJK TC</family>
              <family>AR PL UMing TW</family>
          </accept>
      </alias>
      <alias>
          <family>細明體</family>
          <accept>
+            <family>Noto Serif CJK TC</family>
              <family>AR PL UMing TW</family>
          </accept>
      </alias>
      <alias>
          <family>PMingLiU</family>
          <accept>
+            <family>Noto Serif CJK TC</family>
              <family>AR PL UMing TW</family>
          </accept>
      </alias>
      <alias>
          <family>新細明體</family>
          <accept>
+            <family>Noto Serif CJK TC</family>
              <family>AR PL UMing TW</family>
          </accept>
      </alias>
      <alias>
          <family>AR MingtiM BIG-5</family>
          <accept>
+            <family>Noto Serif CJK TC</family>
              <family>AR PL UMing TW</family>
          </accept>
      </alias>
      <alias>
          <family>DFKai\-SB</family>
          <accept>
+            <family>Noto Serif CJK TC</family>
              <family>AR PL UKai TW</family>
              <family>AR PL ZenKai Uni</family>
          </accept>
@@ -469,6 +526,7 @@
      <alias>
          <family>標楷體</family>
          <accept>
+            <family>Noto Serif CJK TC</family>
              <family>AR PL UKai TW</family>
              <family>AR PL ZenKai Uni</family>
          </accept>
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/31-cantarell.conf b/fonts/conf.avail/31-cantarell.conf

deleted file mode 100644 (file)

index 2b3ab09..0000000
--- a/fonts/conf.avail/31-cantarell.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!--
-
-     Define aliasing and other fontconfig settings for Cantarell.
-
--->
-<fontconfig>
-  <!-- Generic name assignment -->
-  <match target="pattern">
-    <test qual="any" name="family">
-      <string>Cantarell</string>
-    </test>
-    <edit name="family" mode="assign" binding="weak">
-      <string>Cantarell</string>
-    </edit>
-  </match>
-</fontconfig>
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/64-01-tlwg-kinnari.conf b/fonts/conf.avail/64-01-tlwg-kinnari.conf

deleted file mode 100644 (file)

index 4f7bce5..0000000
--- a/fonts/conf.avail/64-01-tlwg-kinnari.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <alias>
-               <family>serif</family>
-               <prefer>
-                       <family>Kinnari</family>
-               </prefer>
-       </alias>
-</fontconfig>
diff --git a/fonts/conf.avail/64-02-tlwg-norasi.conf b/fonts/conf.avail/64-02-tlwg-norasi.conf

deleted file mode 100644 (file)

index 5a42095..0000000
--- a/fonts/conf.avail/64-02-tlwg-norasi.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <alias>
-               <family>serif</family>
-               <prefer>
-                       <family>Norasi</family>
-               </prefer>
-       </alias>
-</fontconfig>
diff --git a/fonts/conf.avail/64-11-tlwg-waree.conf b/fonts/conf.avail/64-11-tlwg-waree.conf

deleted file mode 100644 (file)

index fd56109..0000000
--- a/fonts/conf.avail/64-11-tlwg-waree.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <alias>
-               <family>sans-serif</family>
-               <prefer>
-                       <family>Waree</family>
-               </prefer>
-       </alias>
-</fontconfig>
diff --git a/fonts/conf.avail/64-12-tlwg-loma.conf b/fonts/conf.avail/64-12-tlwg-loma.conf

deleted file mode 100644 (file)

index 2d39440..0000000
--- a/fonts/conf.avail/64-12-tlwg-loma.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <alias>
-               <family>sans-serif</family>
-               <prefer>
-                       <family>Loma</family>
-               </prefer>
-       </alias>
-</fontconfig>
diff --git a/fonts/conf.avail/64-13-tlwg-garuda.conf b/fonts/conf.avail/64-13-tlwg-garuda.conf

deleted file mode 100644 (file)

index 17ae43d..0000000
--- a/fonts/conf.avail/64-13-tlwg-garuda.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <alias>
-               <family>sans-serif</family>
-               <prefer>
-                       <family>Garuda</family>
-               </prefer>
-       </alias>
-</fontconfig>
diff --git a/fonts/conf.avail/64-14-tlwg-umpush.conf b/fonts/conf.avail/64-14-tlwg-umpush.conf

deleted file mode 100644 (file)

index 28c0964..0000000
--- a/fonts/conf.avail/64-14-tlwg-umpush.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <alias>
-               <family>sans-serif</family>
-               <prefer>
-                       <family>Umpush</family>
-               </prefer>
-       </alias>
-</fontconfig>
diff --git a/fonts/conf.avail/64-15-laksaman.conf b/fonts/conf.avail/64-15-laksaman.conf

deleted file mode 100644 (file)

index 0754fd2..0000000
--- a/fonts/conf.avail/64-15-laksaman.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <alias>
-               <family>sans-serif</family>
-               <prefer>
-                       <family>Laksaman</family>
-               </prefer>
-       </alias>
-</fontconfig>
diff --git a/fonts/conf.avail/64-21-tlwg-typo.conf b/fonts/conf.avail/64-21-tlwg-typo.conf

deleted file mode 100644 (file)

index c203a5a..0000000
--- a/fonts/conf.avail/64-21-tlwg-typo.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <alias>
-               <family>monospace</family>
-               <prefer>
-                       <family>TlwgTypo</family>
-               </prefer>
-       </alias>
-</fontconfig>
diff --git a/fonts/conf.avail/64-22-tlwg-typist.conf b/fonts/conf.avail/64-22-tlwg-typist.conf

deleted file mode 100644 (file)

index 34f6a77..0000000
--- a/fonts/conf.avail/64-22-tlwg-typist.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <alias>
-               <family>monospace</family>
-               <prefer>
-                       <family>TlwgTypist</family>
-               </prefer>
-       </alias>
-</fontconfig>
diff --git a/fonts/conf.avail/64-23-tlwg-mono.conf b/fonts/conf.avail/64-23-tlwg-mono.conf

deleted file mode 100644 (file)

index 6f830bc..0000000
--- a/fonts/conf.avail/64-23-tlwg-mono.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <alias>
-               <family>monospace</family>
-               <prefer>
-                       <family>TlwgMono</family>
-               </prefer>
-       </alias>
-</fontconfig>
diff --git a/fonts/conf.avail/64-language-selector-prefer.conf b/fonts/conf.avail/64-language-selector-prefer.conf

index e0caee491db3b509030c4f3c71e41b0b0cf3b95e..cdcc11e6b9c7972e49b4221219f7e262d82e3a3e 100644 (file)
--- a/fonts/conf.avail/64-language-selector-prefer.conf
+++ b/fonts/conf.avail/64-language-selector-prefer.conf
@@ -5,14 +5,25 @@
                 <family>sans-serif</family>
                 <prefer>
                         <family>Noto Sans CJK JP</family>
+                       <family>Noto Sans CJK KR</family>
                         <family>Noto Sans CJK SC</family>
                         <family>Noto Sans CJK TC</family>
                 </prefer>
         </alias>
+       <alias>
+               <family>serif</family>
+               <prefer>
+                       <family>Noto Serif CJK JP</family>
+                       <family>Noto Serif CJK KR</family>
+                       <family>Noto Serif CJK SC</family>
+                       <family>Noto Serif CJK TC</family>
+               </prefer>
+       </alias>
         <alias>
                 <family>monospace</family>
                 <prefer>
                         <family>Noto Sans Mono CJK JP</family>
+                       <family>Noto Sans Mono CJK KR</family>
                         <family>Noto Sans Mono CJK SC</family>
                         <family>Noto Sans Mono CJK TC</family>
                 </prefer>
diff --git a/fonts/conf.avail/65-0-fonts-guru-extra.conf b/fonts/conf.avail/65-0-fonts-guru-extra.conf

new file mode 100644 (file)

index 0000000..4142e56
--- /dev/null
+++ b/fonts/conf.avail/65-0-fonts-guru-extra.conf
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+       <!-- Punjabi (pa) -->
+       <match target="pattern">
+               <test name="lang" compare="contains">
+                       <string>pa</string>
+               </test>
+               <test qual="any" name="family">
+                       <string>sans-serif</string>
+               </test>
+               <edit name="family" mode="append" binding="same">
+                       <string>Saab</string>
+               </edit>
+       </match>
+
+       <match target="pattern">
+               <test name="lang" compare="contains">
+                       <string>pa</string>
+               </test>
+               <test qual="any" name="family">
+                       <string>serif</string>
+               </test>
+               <edit name="family" mode="append" binding="same">
+                       <string>Lohit Punjabi</string>
+               </edit>
+       </match>
+       <!-- Punjabi (pa) ends -->
+</fontconfig>
+
diff --git a/fonts/conf.avail/65-0-fonts-guru-extra.conf/65-0-fonts-guru-extra.conf b/fonts/conf.avail/65-0-fonts-guru-extra.conf/65-0-fonts-guru-extra.conf

deleted file mode 100644 (file)

index 4142e56..0000000
--- a/fonts/conf.avail/65-0-fonts-guru-extra.conf/65-0-fonts-guru-extra.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <!-- Punjabi (pa) -->
-       <match target="pattern">
-               <test name="lang" compare="contains">
-                       <string>pa</string>
-               </test>
-               <test qual="any" name="family">
-                       <string>sans-serif</string>
-               </test>
-               <edit name="family" mode="append" binding="same">
-                       <string>Saab</string>
-               </edit>
-       </match>
-
-       <match target="pattern">
-               <test name="lang" compare="contains">
-                       <string>pa</string>
-               </test>
-               <test qual="any" name="family">
-                       <string>serif</string>
-               </test>
-               <edit name="family" mode="append" binding="same">
-                       <string>Lohit Punjabi</string>
-               </edit>
-       </match>
-       <!-- Punjabi (pa) ends -->
-</fontconfig>
-
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.avail/66-lohit-gurmukhi.conf b/fonts/conf.avail/66-lohit-gurmukhi.conf

new file mode 100644 (file)

index 0000000..ddae760
--- /dev/null
+++ b/fonts/conf.avail/66-lohit-gurmukhi.conf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<match>
+  <test name="lang" compare="contains">
+    <string>pa</string>
+  </test>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>Lohit Gurmukhi</string>
+  </edit>
+</match>
+<match target="font">
+  <test name="family" compare="eq">
+    <string>Lohit Gurmukhi</string>
+  </test>
+  <edit name="autohint" mode="assign">
+    <bool>true</bool>
+  </edit>
+</match>
+<alias>
+  <family>Lohit Gurmukhi</family>
+  <default>
+    <family>sans-serif</family>
+  </default>
+</alias>
+</fontconfig>
+
diff --git a/fonts/conf.avail/69-language-selector-ja.conf b/fonts/conf.avail/69-language-selector-ja.conf

new file mode 100644 (file)

index 0000000..216a1a6
--- /dev/null
+++ b/fonts/conf.avail/69-language-selector-ja.conf
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+       <match target="font">
+               <test qual="all" name="family" compare="contains">
+                       <string>Noto</string>
+               </test>
+               <test qual="all" name="family" compare="contains">
+                       <string>JP</string>
+               </test>
+               <test qual="all" name="pixelsize" compare="less_eq">
+                       <double>18</double>
+               </test>
+               <edit mode="assign" name="embeddedbitmap">
+                       <bool>false</bool>
+               </edit>
+               <edit mode="assign" name="hintstyle">
+                       <const>hintnone</const>
+               </edit>
+       </match>
+</fontconfig>
diff --git a/fonts/conf.avail/69-language-selector-zh-cn.conf b/fonts/conf.avail/69-language-selector-zh-cn.conf

index 916a8b13fd546a7be875dd3153b31b1fd80ef4fe..254249a906d558d168d3a233862e4e719f333fc5 100644 (file)
--- a/fonts/conf.avail/69-language-selector-zh-cn.conf
+++ b/fonts/conf.avail/69-language-selector-zh-cn.conf
@@ -10,6 +10,7 @@
                         <string>serif</string>
                 </test>
                 <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Serif CJK SC</string>
                         <string>HYSong</string>
                         <string>AR PL UMing CN</string>
                         <string>AR PL UMing HK</string>
diff --git a/fonts/conf.avail/69-language-selector-zh-hk.conf b/fonts/conf.avail/69-language-selector-zh-hk.conf

index a987ec9a09d04ae69fc7eabfc7e9fc9008f344db..ee23e6d3ed8fed4f8e0f9ccc8d4f193f8ada8d12 100644 (file)
--- a/fonts/conf.avail/69-language-selector-zh-hk.conf
+++ b/fonts/conf.avail/69-language-selector-zh-hk.conf
@@ -10,6 +10,7 @@
              <string>zh-hk</string>
          </test>
                 <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Serif CJK TC</string>
                         <string>AR PL UMing HK</string>
                         <string>AR PL New Sung</string>
                         <string>HYSong</string>
diff --git a/fonts/conf.avail/69-language-selector-zh-mo.conf b/fonts/conf.avail/69-language-selector-zh-mo.conf

index 5caf7ef2315a3f77d12fdc71ee8873f68151b75b..57af1777778a0228bbcb4a58f83523f9f904bd3f 100644 (file)
--- a/fonts/conf.avail/69-language-selector-zh-mo.conf
+++ b/fonts/conf.avail/69-language-selector-zh-mo.conf
@@ -10,6 +10,7 @@
              <string>zh-mo</string>
          </test>
                 <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Serif CJK TC</string>
                         <string>AR PL UMing HK</string>
                         <string>AR PL New Sung</string>
                         <string>HYSong</string>
diff --git a/fonts/conf.avail/69-language-selector-zh-sg.conf b/fonts/conf.avail/69-language-selector-zh-sg.conf

index 82472df344dc7985e70b390a4f5b7840267967ed..13693e660b3aea3527481f1210a80d63f7cdb852 100644 (file)
--- a/fonts/conf.avail/69-language-selector-zh-sg.conf
+++ b/fonts/conf.avail/69-language-selector-zh-sg.conf
@@ -10,6 +10,7 @@
              <string>zh-sg</string>
          </test>
                 <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Serif CJK SC</string>
                         <string>HYSong</string>
                         <string>AR PL UMing CN</string>
                         <string>AR PL UMing HK</string>
diff --git a/fonts/conf.avail/69-language-selector-zh-tw.conf b/fonts/conf.avail/69-language-selector-zh-tw.conf

index bdb52b3d93b404f5b011ee39f9409fb2d1e4b612..6cd0500fd2ae96cf18ffecbb4234d55d41172178 100644 (file)
--- a/fonts/conf.avail/69-language-selector-zh-tw.conf
+++ b/fonts/conf.avail/69-language-selector-zh-tw.conf
@@ -11,6 +11,7 @@
              <string>zh-tw</string>
          </test>
                 <edit name="family" mode="prepend" binding="strong">
+                       <string>Noto Serif CJK TC</string>
                         <string>AR PL UMing TW</string>
                         <string>AR PL UMing HK</string>
                         <string>AR PL New Sung</string>
diff --git a/fonts/conf.avail/89-tlwg-garuda-synthetic.conf b/fonts/conf.avail/89-tlwg-garuda-synthetic.conf

deleted file mode 100644 (file)

index 39cf739..0000000
--- a/fonts/conf.avail/89-tlwg-garuda-synthetic.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <!-- Synthesize Windows Browallia with scaled-down Garuda -->
-       <match target="pattern">
-               <test qual="any" name="family" compare="contains">
-                       <string>Browallia</string>
-               </test>
-               <edit name="family" mode="append" binding="same">
-                       <string>Garuda</string>
-               </edit>
-       </match>
-       <match target="font">
-               <test name="family" compare="eq">
-                       <string>Garuda</string>
-               </test>
-               <test target="pattern" qual="any" name="family" compare="contains">
-                       <string>Browallia</string>
-               </test>
-               <edit name="matrix" mode="assign">
-                       <matrix>
-                               <double>0.68</double><double>0</double>
-                               <double>0</double><double>0.68</double>
-                       </matrix>
-               </edit>
-       </match>
-</fontconfig>
diff --git a/fonts/conf.avail/89-tlwg-kinnari-synthetic.conf b/fonts/conf.avail/89-tlwg-kinnari-synthetic.conf

deleted file mode 100644 (file)

index 417f5a5..0000000
--- a/fonts/conf.avail/89-tlwg-kinnari-synthetic.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <!-- Synthesize Windows Angsana with scaled-down Kinnari -->
-       <match target="pattern">
-               <test qual="any" name="family" compare="contains">
-                       <string>Angsana</string>
-               </test>
-               <edit name="family" mode="append" binding="same">
-                       <string>Kinnari</string>
-               </edit>
-       </match>
-       <match target="font">
-               <test name="family" compare="eq">
-                       <string>Kinnari</string>
-               </test>
-               <test target="pattern" qual="any" name="family" compare="contains">
-                       <string>Angsana</string>
-               </test>
-               <edit name="matrix" mode="assign">
-                       <matrix>
-                               <double>0.67</double><double>0</double>
-                               <double>0</double><double>0.67</double>
-                       </matrix>
-               </edit>
-       </match>
-</fontconfig>
diff --git a/fonts/conf.avail/89-tlwg-laksaman-synthetic.conf b/fonts/conf.avail/89-tlwg-laksaman-synthetic.conf

deleted file mode 100644 (file)

index 4e25713..0000000
--- a/fonts/conf.avail/89-tlwg-laksaman-synthetic.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <!-- Synthesize TH Sarabun with scaled-down Laksaman -->
-       <match target="pattern">
-               <test qual="any" name="family" compare="contains">
-                       <string>TH Sarabun</string>
-               </test>
-               <edit name="family" mode="append" binding="same">
-                       <string>Laksaman</string>
-               </edit>
-       </match>
-       <match target="font">
-               <test name="family" compare="eq">
-                       <string>Laksaman</string>
-               </test>
-               <test target="pattern" qual="any" name="family" compare="contains">
-                       <string>TH Sarabun</string>
-               </test>
-               <edit name="matrix" mode="assign">
-                       <matrix>
-                               <double>0.66</double><double>0</double>
-                               <double>0</double><double>0.66</double>
-                       </matrix>
-               </edit>
-       </match>
-</fontconfig>
diff --git a/fonts/conf.avail/89-tlwg-loma-synthetic.conf b/fonts/conf.avail/89-tlwg-loma-synthetic.conf

deleted file mode 100644 (file)

index 9f0f4d4..0000000
--- a/fonts/conf.avail/89-tlwg-loma-synthetic.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <!-- Fall back missing MS Sans Serif to Loma -->
-       <match target="pattern">
-               <test name="lang" compare="contains">
-                       <string>th</string>
-               </test>
-               <test qual="any" name="family" compare="eq">
-                       <string>MS Sans Serif</string>
-               </test>
-               <edit name="family" mode="append" binding="same">
-                       <string>Loma</string>
-               </edit>
-       </match>
-       <match target="pattern">
-               <test name="lang" compare="contains">
-                       <string>th</string>
-               </test>
-               <test qual="any" name="family" compare="eq">
-                       <string>Microsoft Sans Serif</string>
-               </test>
-               <edit name="family" mode="append" binding="same">
-                       <string>Loma</string>
-               </edit>
-       </match>
-</fontconfig>
diff --git a/fonts/conf.avail/89-tlwg-umpush-synthetic.conf b/fonts/conf.avail/89-tlwg-umpush-synthetic.conf

deleted file mode 100644 (file)

index f0892b6..0000000
--- a/fonts/conf.avail/89-tlwg-umpush-synthetic.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <!-- Synthesize Windows Cordia with scaled-down Umpush -->
-       <match target="pattern">
-               <test qual="any" name="family" compare="contains">
-                       <string>Cordia</string>
-               </test>
-               <edit name="family" mode="append" binding="same">
-                       <string>Umpush</string>
-               </edit>
-       </match>
-       <match target="font">
-               <test name="family" compare="eq">
-                       <string>Umpush</string>
-               </test>
-               <test target="pattern" qual="any" name="family" compare="contains">
-                       <string>Cordia</string>
-               </test>
-               <edit name="matrix" mode="assign">
-                       <matrix>
-                               <double>0.65</double><double>0</double>
-                               <double>0</double><double>0.65</double>
-                       </matrix>
-               </edit>
-       </match>
-</fontconfig>
diff --git a/fonts/conf.avail/89-tlwg-waree-synthetic.conf b/fonts/conf.avail/89-tlwg-waree-synthetic.conf

deleted file mode 100644 (file)

index ade6788..0000000
--- a/fonts/conf.avail/89-tlwg-waree-synthetic.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-       <!-- Fall back missing Tahoma to Waree -->
-       <match target="pattern">
-               <test name="lang" compare="contains">
-                       <string>th</string>
-               </test>
-               <test qual="any" name="family" compare="eq">
-                       <string>Tahoma</string>
-               </test>
-               <edit name="family" mode="append" binding="same">
-                       <string>Waree</string>
-               </edit>
-       </match>
-</fontconfig>
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-opensymbol.conf b/fonts/conf.d/30-opensymbol.conf

new file mode 120000 (symlink)

index 0000000..f373ada
--- /dev/null
+++ b/fonts/conf.d/30-opensymbol.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/30-opensymbol.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/31-cantarell.conf b/fonts/conf.d/31-cantarell.conf

index bf3d833c3d1e240bf2cf8c5b67fa842434ee5fee..96fab3c07a39489487961f19636e1c61fd8f2e41 120000 (symlink)
--- a/fonts/conf.d/31-cantarell.conf
+++ b/fonts/conf.d/31-cantarell.conf
@@ -1 +1 @@
-../conf.avail/31-cantarell.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/31-cantarell.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/64-01-tlwg-kinnari.conf b/fonts/conf.d/64-01-tlwg-kinnari.conf

index 1910f4afa9a95a099d9d5f5dbeec0c84d9b99088..8046190f33b3ba72839efdb3a56beefcdea0c9c5 120000 (symlink)
--- a/fonts/conf.d/64-01-tlwg-kinnari.conf
+++ b/fonts/conf.d/64-01-tlwg-kinnari.conf
@@ -1 +1 @@
-../conf.avail/64-01-tlwg-kinnari.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/64-01-tlwg-kinnari.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/64-02-tlwg-norasi.conf b/fonts/conf.d/64-02-tlwg-norasi.conf

index 5e87a41b575944964f38b0024f4f042be6cc394b..4cf1124ce2161b1b04fdc12d3878b2f59107484f 120000 (symlink)
--- a/fonts/conf.d/64-02-tlwg-norasi.conf
+++ b/fonts/conf.d/64-02-tlwg-norasi.conf
@@ -1 +1 @@
-../conf.avail/64-02-tlwg-norasi.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/64-02-tlwg-norasi.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/64-10-tlwg-loma.conf b/fonts/conf.d/64-10-tlwg-loma.conf

new file mode 120000 (symlink)

index 0000000..f7fd86d
--- /dev/null
+++ b/fonts/conf.d/64-10-tlwg-loma.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/64-10-tlwg-loma.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/64-11-tlwg-waree.conf b/fonts/conf.d/64-11-tlwg-waree.conf

index e60cc1429fe74b476ffc0fee8dd99002ad473c6c..613b3c01f3d94b2bb59c7930611bb44d27f3054c 120000 (symlink)
--- a/fonts/conf.d/64-11-tlwg-waree.conf
+++ b/fonts/conf.d/64-11-tlwg-waree.conf
@@ -1 +1 @@
-../conf.avail/64-11-tlwg-waree.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/64-11-tlwg-waree.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/64-12-tlwg-loma.conf b/fonts/conf.d/64-12-tlwg-loma.conf

deleted file mode 120000 (symlink)

index 0076daa..0000000
--- a/fonts/conf.d/64-12-tlwg-loma.conf
+++ /dev/null
@@ -1 +0,0 @@
-../conf.avail/64-12-tlwg-loma.conf
-\ No newline at end of file
diff --git a/fonts/conf.d/64-13-tlwg-garuda.conf b/fonts/conf.d/64-13-tlwg-garuda.conf

index d74471ecdd0cc05d266c74968549a1f84ebbd159..7c75d55f8a31bbe0cf4a5b73dfe9c5ee0cd053bb 120000 (symlink)
--- a/fonts/conf.d/64-13-tlwg-garuda.conf
+++ b/fonts/conf.d/64-13-tlwg-garuda.conf
@@ -1 +1 @@
-../conf.avail/64-13-tlwg-garuda.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/64-13-tlwg-garuda.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/64-14-tlwg-umpush.conf b/fonts/conf.d/64-14-tlwg-umpush.conf

index ac76dc93cb6a4c6562a0b0bf7ab20d17515764d1..9fcee70098230f739cb76f4282bb5030cfe69288 120000 (symlink)
--- a/fonts/conf.d/64-14-tlwg-umpush.conf
+++ b/fonts/conf.d/64-14-tlwg-umpush.conf
@@ -1 +1 @@
-../conf.avail/64-14-tlwg-umpush.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/64-14-tlwg-umpush.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/64-15-laksaman.conf b/fonts/conf.d/64-15-laksaman.conf

index 6f84ed9c6ec4e2d1fdb1dcb395336aec303da3f0..ca5036f1a354eea76be011c92a814260bdfe87a8 120000 (symlink)
--- a/fonts/conf.d/64-15-laksaman.conf
+++ b/fonts/conf.d/64-15-laksaman.conf
@@ -1 +1 @@
-../conf.avail/64-15-laksaman.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/64-15-laksaman.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/64-21-tlwg-typo.conf b/fonts/conf.d/64-21-tlwg-typo.conf

index bb242187aab4499c20ed43594e49e669782a45d7..0f8b87a52b35bc1c84c4791e6decbd224b867b28 120000 (symlink)
--- a/fonts/conf.d/64-21-tlwg-typo.conf
+++ b/fonts/conf.d/64-21-tlwg-typo.conf
@@ -1 +1 @@
-../conf.avail/64-21-tlwg-typo.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/64-21-tlwg-typo.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/64-22-tlwg-typist.conf b/fonts/conf.d/64-22-tlwg-typist.conf

index a7b5f8a5b88c5732fb75d04babbda6b456b2d0d6..de92fff68f952520a12c15353271644011ac10dc 120000 (symlink)
--- a/fonts/conf.d/64-22-tlwg-typist.conf
+++ b/fonts/conf.d/64-22-tlwg-typist.conf
@@ -1 +1 @@
-../conf.avail/64-22-tlwg-typist.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/64-22-tlwg-typist.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/64-23-tlwg-mono.conf b/fonts/conf.d/64-23-tlwg-mono.conf

index b87471f47d28200684510d6db1b4effd247d89a1..1d9542b46efba89d7c00fef66cadbbf1088c900a 120000 (symlink)
--- a/fonts/conf.d/64-23-tlwg-mono.conf
+++ b/fonts/conf.d/64-23-tlwg-mono.conf
@@ -1 +1 @@
-../conf.avail/64-23-tlwg-mono.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/64-23-tlwg-mono.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/66-lohit-gurmukhi.conf b/fonts/conf.d/66-lohit-gurmukhi.conf

new file mode 120000 (symlink)

index 0000000..2e1ad9d
--- /dev/null
+++ b/fonts/conf.d/66-lohit-gurmukhi.conf
@@ -0,0 +1 @@
+../conf.avail/66-lohit-gurmukhi.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/66-lohit-punjabi.conf b/fonts/conf.d/66-lohit-punjabi.conf

deleted file mode 120000 (symlink)

index 65bc2ab..0000000
--- a/fonts/conf.d/66-lohit-punjabi.conf
+++ /dev/null
@@ -1 +0,0 @@
-../conf.avail/66-lohit-punjabi.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/conf.d/70-fonts-noto-cjk.conf b/fonts/conf.d/70-fonts-noto-cjk.conf

new file mode 120000 (symlink)

index 0000000..af9a22a
--- /dev/null
+++ b/fonts/conf.d/70-fonts-noto-cjk.conf
@@ -0,0 +1 @@
+/usr/share/fontconfig/conf.avail/70-fonts-noto-cjk.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/89-tlwg-garuda-synthetic.conf b/fonts/conf.d/89-tlwg-garuda-synthetic.conf

index d5dfbea7c8b19abbcfce8cba3cd6764347f15e06..6b992186686efbed8a13fab043276b5ed6af668b 120000 (symlink)
--- a/fonts/conf.d/89-tlwg-garuda-synthetic.conf
+++ b/fonts/conf.d/89-tlwg-garuda-synthetic.conf
@@ -1 +1 @@
-../conf.avail/89-tlwg-garuda-synthetic.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/89-tlwg-garuda-synthetic.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/89-tlwg-kinnari-synthetic.conf b/fonts/conf.d/89-tlwg-kinnari-synthetic.conf

index 608cfd209c57304bfc4acecdd0c5283e3bb9cc76..7f364d32d58b67a177b1557cc1713c576327a45d 120000 (symlink)
--- a/fonts/conf.d/89-tlwg-kinnari-synthetic.conf
+++ b/fonts/conf.d/89-tlwg-kinnari-synthetic.conf
@@ -1 +1 @@
-../conf.avail/89-tlwg-kinnari-synthetic.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/89-tlwg-kinnari-synthetic.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/89-tlwg-laksaman-synthetic.conf b/fonts/conf.d/89-tlwg-laksaman-synthetic.conf

index 72c3b419bae08f3ffbb3d53362a0c2ead0b355f0..2adc2d2d63e193c1b1fd63cd9497acb4a5cfcefd 120000 (symlink)
--- a/fonts/conf.d/89-tlwg-laksaman-synthetic.conf
+++ b/fonts/conf.d/89-tlwg-laksaman-synthetic.conf
@@ -1 +1 @@
-../conf.avail/89-tlwg-laksaman-synthetic.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/89-tlwg-laksaman-synthetic.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/89-tlwg-loma-synthetic.conf b/fonts/conf.d/89-tlwg-loma-synthetic.conf

deleted file mode 120000 (symlink)

index 244c330..0000000
--- a/fonts/conf.d/89-tlwg-loma-synthetic.conf
+++ /dev/null
@@ -1 +0,0 @@
-../conf.avail/89-tlwg-loma-synthetic.conf
-\ No newline at end of file
diff --git a/fonts/conf.d/89-tlwg-umpush-synthetic.conf b/fonts/conf.d/89-tlwg-umpush-synthetic.conf

index b67f9b7577d09ff63e04c3d16e275f3a7cbb037d..59bb78e6570d729b39fbe3ffb8185ebb2952283b 120000 (symlink)
--- a/fonts/conf.d/89-tlwg-umpush-synthetic.conf
+++ b/fonts/conf.d/89-tlwg-umpush-synthetic.conf
@@ -1 +1 @@
-../conf.avail/89-tlwg-umpush-synthetic.conf
-\ No newline at end of file
+/usr/share/fontconfig/conf.avail/89-tlwg-umpush-synthetic.conf
+\ No newline at end of file
diff --git a/fonts/conf.d/89-tlwg-waree-synthetic.conf b/fonts/conf.d/89-tlwg-waree-synthetic.conf

deleted file mode 120000 (symlink)

index b4ec9e4..0000000
--- a/fonts/conf.d/89-tlwg-waree-synthetic.conf
+++ /dev/null
@@ -1 +0,0 @@
-../conf.avail/89-tlwg-waree-synthetic.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/geoclue/geoclue.conf b/geoclue/geoclue.conf

index 7a7c11e424f7f593a1454531d52caa1e1dee323f..61b649674d063f27eb34cc5cf95c20fef485147b 100644 (file)
--- a/geoclue/geoclue.conf
+++ b/geoclue/geoclue.conf
@@ -68,22 +68,22 @@ allowed=true
  system=true
  users=
  
-[epiphany]
+[gnome-color-panel]
  allowed=true
-system=false
+system=true
  users=
  
-[epiphany-browser]
+[org.gnome.Shell]
  allowed=true
-system=false
+system=true
  users=
  
-[firefox]
+[epiphany]
  allowed=true
  system=false
  users=
  
-[iceweasel]
+[firefox]
  allowed=true
  system=false
  users=
diff --git a/gnome/defaults.list b/gnome/defaults.list

index c834ad389b02db37c0ca9e082729e5ede00fad23..baa5cbdba5daa59c3dc1b3d8c4593d29c5267587 100644 (file)
--- a/gnome/defaults.list
+++ b/gnome/defaults.list
@@ -216,7 +216,7 @@ text/x-java=gedit.desktop
  text/mathml=gedit.desktop
  text/x-python=gedit.desktop
  text/x-sql=gedit.desktop
-text/xml=firefox.desktop
+text/xml=gedit.desktop
  video/3gpp=org.gnome.Totem.desktop
  video/dv=org.gnome.Totem.desktop
  video/fli=org.gnome.Totem.desktop
diff --git a/gnome/menus.blacklist b/gnome/menus.blacklist

index 1960407ffb4adddfd7469e90422b5cd36252a3e5..9af4fa236f59c16b7dea358a0e3bd228761c5a80 100644 (file)
--- a/gnome/menus.blacklist
+++ b/gnome/menus.blacklist
@@ -1,32 +1,18 @@
-# openjdk-6
-openjdk-6-java.desktop
-openjdk-6-policytool.desktop
+# openjdk-8
+openjdk-8-policytool.desktop
  
-# openjdk-7
-openjdk-7-java.desktop
-openjdk-7-policytool.desktop
-
-# sun-java6
-sun-java6-controlpanel.desktop
-sun-java6-java.desktop
-sun-java6-javaws.desktop
-sun-java6-jvisualvm.desktop
-sun-java6-policytool.desktop
+# openjdk-9
+openjdk-9-policytool.desktop
  
  # icedtea
-icedtea-netx-javaws.desktop
  itweb-settings.desktop
  
-# hplip
-hplip.desktop
-hp-fab.desktop
-hp-sendfax.desktop
+# Oracle Java
+sun_java.desktop
  
  # imagemagick (Bug #677318)
-display.im6.desktop
-
-# foo2zjs
-hplj1020.desktop
+display-im6.desktop
+display-im6.q16.desktop
  
  # kde4libs (Bug #673362)
  kde4/kmailservice.desktop
@@ -179,12 +165,9 @@ kde4/klinkstatus.desktop
  
  # Other KDE-only stuff that have GNOME equivalents in the standard install
  Kino.desktop
-qt3config.desktop
-qt4config.desktop
  qtconfig-qt4.desktop
  
  # Viewers only belong in the MIME associations, not in the menu
-djvulibre-djview3.desktop
  djvulibre-djview4.desktop
  xpdf.desktop
  
@@ -194,31 +177,12 @@ bazaar-properties.desktop
  bzr-notify.desktop
  
  # xscreensaver
-xscreensaver.desktop
  xscreensaver-properties.desktop
-screensavers/tessellimage.desktop
-screensavers/distort.desktop
-screensavers/fuzzyflakes.desktop
-screensavers/xlyap.desktop
-screensavers/ripples.desktop
-screensavers/abstractile.desktop
-screensavers/slidescreen.desktop
-screensavers/shadebobs.desktop
-screensavers/fiberlamp.desktop
-screensavers/metaballs.desktop
-screensavers/hexadrop.desktop
-screensavers/cwaves.desktop
-screensavers/galaxy.desktop
-screensavers/deco.desktop
-screensavers/swirl.desktop
-screensavers/penrose.desktop
-screensavers/m6502.desktop
  
  # IDLE - we don't need one entry for each Python version
-idle-python2.5.desktop
  idle-python2.6.desktop
  
-# XTerm
+# XTerm (Bug #856858)
  debian-xterm.desktop
  debian-uxterm.desktop
  
@@ -226,6 +190,12 @@ debian-uxterm.desktop
  Thunar-bulk-rename.desktop
  Thunar.desktop
  thunar-volman-settings.desktop
+thunar-settings.desktop
+
+xfce4-appfinder.desktop
+xfce4-dict.desktop
+xfce4-screenshooter.desktop
+xfce4-sensors.desktop
  
  # ViM
  vim.desktop
@@ -234,10 +204,17 @@ vim.desktop
  prerex.desktop
  vprerex.desktop
  
-# NetworkManager (already in control-center)
-nm-connection-editor.desktop
-
-# Orca (already in accessibility menu)
-orca.desktop
-# GNOME power manager (used from other places)
-gnome-power-statistics.desktop
+# Cinnamon
+blueman-manager.desktop
+nemo.desktop
+
+# KDE5/Plasma
+org.kde.kaddressbook.desktop
+org.kde.contactthemeeditor.desktop
+org.kde.headerthemeeditor.desktop
+org.kde.contactprintthemeeditor.desktop
+org.kde.importwizard.desktop
+org.kde.pimsettingexporter.desktop
+org.kde.ktnef.desktop
+org.kde.klipper.desktop
+org.kde.spectacle.desktop
diff --git a/groff/man.local b/groff/man.local

index 4cb598c5d1093958bb27e050ac88daf38ede0973..0c5cd9a61f6fdcc80abcdcd0bc876b54ec73af76 100644 (file)
--- a/groff/man.local
+++ b/groff/man.local
@@ -20,4 +20,14 @@
  .  \" manual pages you're writing are clear of this problem.
  .  \" if '\*[.T]'utf8' \
  .  \"   char - \[hy]
+.
+.  \" Debian: "\-" is more commonly used for option dashes than for minus
+.  \" signs in manual pages, so map it to plain "-" for HTML/XHTML output
+.  \" rather than letting it be rendered as "&minus;".
+.  ie '\*[.T]'html' \
+.    char \- \N'45'
+.  el \{\
+.    if '\*[.T]'xhtml' \
+.      char \- \N'45'
+.  \}
  .\}
diff --git a/groff/mdoc.local b/groff/mdoc.local

index d96b6b79819105c3950fe71bf0a55e58a38c1e22..c29fac803e47ead8b653e62a5d789ec0a29b1357 100644 (file)
--- a/groff/mdoc.local
+++ b/groff/mdoc.local
@@ -20,4 +20,14 @@
  .  \" manual pages you're writing are clear of this problem.
  .  \" if '\*[.T]'utf8' \
  .  \"   char - \[hy]
+.
+.  \" Debian: "\-" is more commonly used for option dashes than for minus
+.  \" signs in manual pages, so map it to plain "-" for HTML/XHTML output
+.  \" rather than letting it be rendered as "&minus;".
+.  ie '\*[.T]'html' \
+.    char \- \N'45'
+.  el \{\
+.    if '\*[.T]'xhtml' \
+.      char \- \N'45'
+.  \}
  .\}
diff --git a/grub.d/00_header b/grub.d/00_header

index 545e4ad90cb435a0eefc489db80e3172078a010b..52ca719298dc20d3f397ea3b19a71a36a18e30e3 100755 (executable)
--- a/grub.d/00_header
+++ b/grub.d/00_header
@@ -27,7 +27,7 @@ quick_boot="1"
  export TEXTDOMAIN=grub
  export TEXTDOMAINDIR="${datarootdir}/locale"
  
-. "${datarootdir}/grub/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
  
  # Do this as early as possible, since other commands might depend on it.
  # (e.g. the `loadfont' command might need lvm or raid modules)
diff --git a/grub.d/10_linux b/grub.d/10_linux

index 68700d9b0e43d0c35733e214f36b3a5bb3911598..620980ece3250f62d98d4406596c891bd40c51d8 100755 (executable)
--- a/grub.d/10_linux
+++ b/grub.d/10_linux
@@ -26,7 +26,7 @@ quick_boot="1"
  gfxpayload_dynamic="1"
  vt_handoff="1"
  
-. "${datarootdir}/grub/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
  
  export TEXTDOMAIN=grub
  export TEXTDOMAINDIR="${datarootdir}/locale"
@@ -61,9 +61,11 @@ case ${GRUB_DEVICE} in
    ;;
  esac
  
+# btrfs may reside on multiple devices. We cannot pass them as value of root= parameter
+# and mounting btrfs requires user space scanning, so force UUID in this case.
  if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
      || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
-    || uses_abstraction "${GRUB_DEVICE}" lvm; then
+    || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
    LINUX_ROOT_DEVICE=${GRUB_DEVICE}
  else
    LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
@@ -207,13 +209,15 @@ EOF
  machine=`uname -m`
  case "x$machine" in
      xi?86 | xx86_64)
-       list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
-                  if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
-              done` ;;
+       list=
+       for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
+           if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
+       done ;;
      *) 
-       list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
-                  if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
-            done` ;;
+       list=
+       for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
+                  if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
+       done ;;
  esac
  
  case "$machine" in
@@ -236,7 +240,7 @@ EOF
  if [ "$vt_handoff" = 1 ]; then
    cat << 'EOF'
         if [ "${1}" = "keep" ]; then
-               set vt_handoff=vt.handoff=7
+               set vt_handoff=vt.handoff=1
         else
                 set vt_handoff=
         fi
@@ -351,7 +355,7 @@ while [ "x$list" != "x" ] ; do
                "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
    for supported_init in ${SUPPORTED_INITS}; do
      init_path="${supported_init#*:}"
-    if [ -x "${init_path}" ] && [ "$(readlink -f /sbin/init)" != "${init_path}" ]; then
+    if [ -x "${init_path}" ] && [ "$(readlink -f /sbin/init)" != "$(readlink -f "${init_path}")" ]; then
        linux_entry "${OS}" "${version}" "init-${supported_init%%:*}" \
                   "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} init=${init_path}"
      fi
diff --git a/grub.d/20_linux_xen b/grub.d/20_linux_xen

index 864f95baf9ae8725883e0aa5ee7008c67d1b17b5..0f927fe535c3f3ebe3b6cf5ca47be6e0a06f357f 100755 (executable)
--- a/grub.d/20_linux_xen
+++ b/grub.d/20_linux_xen
@@ -21,7 +21,7 @@ prefix="/usr"
  exec_prefix="/usr"
  datarootdir="/usr/share"
  
-. "${datarootdir}/grub/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
  
  export TEXTDOMAIN=grub
  export TEXTDOMAINDIR="${datarootdir}/locale"
@@ -49,9 +49,11 @@ case ${GRUB_DEVICE} in
    ;;
  esac
  
+# btrfs may reside on multiple devices. We cannot pass them as value of root= parameter
+# and mounting btrfs requires user space scanning, so force UUID in this case.
  if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
      || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
-    || uses_abstraction "${GRUB_DEVICE}" lvm; then
+    || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
    LINUX_ROOT_DEVICE=${GRUB_DEVICE}
  else
    LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
@@ -145,7 +147,8 @@ EOF
  EOF
  }
  
-linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
+linux_list=
+for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
      if grub_file_is_not_garbage "$i"; then
         basename=$(basename $i)
         version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
@@ -157,9 +160,9 @@ linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
                 break
             fi
         done
-        if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then echo -n "$i " ; fi
+        if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then linux_list="$linux_list $i" ; fi
      fi
-    done`
+done
  if [ "x${linux_list}" = "x" ] ; then
      exit 0
  fi
@@ -173,9 +176,10 @@ file_is_not_sym () {
      esac
  }
  
-xen_list=`for i in /boot/xen*; do
-        if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then echo -n "$i " ; fi
-      done`
+xen_list=
+for i in /boot/xen*; do
+    if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then xen_list="$xen_list $i" ; fi
+done
  prepare_boot_cache=
  boot_device_id=
  
@@ -260,7 +264,7 @@ while [ "x${xen_list}" != "x" ] ; do
             "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
         for supported_init in ${SUPPORTED_INITS}; do
             init_path="${supported_init#*:}"
-           if [ -x "${init_path}" ] && [ "$(readlink -f /sbin/init)" != "${init_path}" ]; then
+           if [ -x "${init_path}" ] && [ "$(readlink -f /sbin/init)" != "$(readlink -f "${init_path}")" ]; then
                 linux_entry "${OS}" "${version}" "${xen_version}" "init-${supported_init%%:*}" \
                     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} init=${init_path}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
  
diff --git a/grub.d/30_os-prober b/grub.d/30_os-prober

index 6e60c3dbd3b4b5972fc697af3e6e5b69672ca18d..258799baae7236d632a69e3f0e27dc7174a2c0d9 100755 (executable)
--- a/grub.d/30_os-prober
+++ b/grub.d/30_os-prober
@@ -25,7 +25,7 @@ quick_boot="1"
  export TEXTDOMAIN=grub
  export TEXTDOMAINDIR="${datarootdir}/locale"
  
-. "${datarootdir}/grub/grub-mkconfig_lib"
+. "$pkgdatadir/grub-mkconfig_lib"
  
  found_other_os=
  
@@ -44,7 +44,7 @@ if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
    exit 0
  fi
  
-if [ -z "`which os-prober 2> /dev/null`" -o -z "`which linux-boot-prober 2> /dev/null`" ] ; then
+if [ -z "`which os-prober 2> /dev/null`" ] || [ -z "`which linux-boot-prober 2> /dev/null`" ] ; then
    # missing os-prober and/or linux-boot-prober
    exit 0
  fi
@@ -86,6 +86,9 @@ EOF
             fi
             if [ /kernelcache -nt /System/Library/Extensions ]; then
                $1 /kernelcache boot-uuid=\${uuid} rd=*uuid
+           elif [ -f /System/Library/Kernels/kernel ]; then
+              $1 /System/Library/Kernels/kernel boot-uuid=\${uuid} rd=*uuid
+              xnu_kextdir /System/Library/Extensions
             else
                $1 /mach_kernel boot-uuid=\${uuid} rd=*uuid
                if [ /System/Library/Extensions.mkext -nt /System/Library/Extensions ]; then
@@ -136,7 +139,7 @@ for OS in ${OSPROBED} ; do
        EXPUUID="${EXPUUID}@${DEVICE#*@}"
      fi
  
-    if [ "x${GRUB_OS_PROBER_SKIP_LIST}" != "x" -a "x`echo ${GRUB_OS_PROBER_SKIP_LIST} | grep -i -e '\b'${EXPUUID}'\b'`" != "x" ] ; then
+    if [ "x${GRUB_OS_PROBER_SKIP_LIST}" != "x" ] && [ "x`echo ${GRUB_OS_PROBER_SKIP_LIST} | grep -i -e '\b'${EXPUUID}'\b'`" != "x" ] ; then
        echo "Skipped ${LONGNAME} on ${DEVICE} by user request." >&2
        continue
      fi
@@ -152,6 +155,9 @@ for OS in ${OSPROBED} ; do
      LONGNAME="${LABEL}"
    fi
  
+  # os-prober returns text string followed by optional counter
+  CLASS="--class $(echo "${LABEL}" | LC_ALL=C sed 's,[[:digit:]]*$,,' | cut -d' ' -f1 | tr 'A-Z' 'a-z' | LC_ALL=C sed 's,[^[:alnum:]_],_,g')"
+
    gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&2
  
    case ${BOOT} in
@@ -177,7 +183,7 @@ for OS in ${OSPROBED} ; do
        found_other_os=1
           onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
        cat << EOF
-menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --class os \$menuentry_id_option 'osprober-chain-$(grub_get_device_id "${DEVICE}")' {
+menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' $CLASS --class os \$menuentry_id_option 'osprober-chain-$(grub_get_device_id "${DEVICE}")' {
  EOF
        save_default_entry | grub_add_tab
        prepare_grub_to_access_device ${DEVICE} | grub_add_tab
@@ -210,7 +216,7 @@ EOF
         DEVICE=${DEVICE%@*}
         onstr="$(gettext_printf "(on %s)" "${DEVICE}")"
        cat << EOF
-menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --class os \$menuentry_id_option 'osprober-efi-$(grub_get_device_id "${DEVICE}")' {
+menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' $CLASS --class os \$menuentry_id_option 'osprober-efi-$(grub_get_device_id "${DEVICE}")' {
  EOF
        save_default_entry | sed -e "s/^/\t/"
        prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
@@ -268,7 +274,7 @@ EOF
  
         if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
              cat << EOF
-menuentry '$(echo "$OS $onstr" | grub_quote)' --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' {
+menuentry '$(echo "$OS $onstr" | grub_quote)' $CLASS --class gnu-linux --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id' {
  EOF
             save_default_entry | grub_add_tab
             printf '%s\n' "${prepare_boot_cache}"
@@ -361,9 +367,8 @@ EOF
  EOF
      ;;
      *)
-      echo -n "  "
        # TRANSLATORS: %s is replaced by OS name.
-      gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&2
+      gettext_printf "%s is not yet supported by grub-mkconfig.\n" "  ${LONGNAME}" >&2
      ;;
    esac
  done
diff --git a/hdparm.conf b/hdparm.conf

index d534c90511cb75ed45c8828952a56bf1ffcf1f52..fbfe81666ce96ae908b29ffc0d49f2e33a7a8b32 100644 (file)
--- a/hdparm.conf
+++ b/hdparm.conf
@@ -1,17 +1,17 @@
-## This is the default configuration for hdparm for Debian.  It is a 
+## This is the default configuration for hdparm for Debian.  It is a
  ## rather simple script, so please follow the following guidelines :)
-## Any line that begins with a comment is ignored - add as many as you 
-## like.  Note that an in-line comment is not supported.  If a line 
+## Any line that begins with a comment is ignored - add as many as you
+## like.  Note that an in-line comment is not supported.  If a line
  ## consists of whitespace only (tabs, spaces, carriage return), it will be
  ## ignored, so you can space control fields as you like.  ANYTHING ELSE
-## IS PARSED!!  This means that lines with stray characters or lines that 
-## use non # comment characters will be interpreted by the initscript.  
-## This has probably minor, but potentially serious, side effects for your 
-## hard drives, so please follow the guidelines.  Patches to improve 
-## flexibilty welcome.  Please read /usr/share/doc/hdparm/README.Debian for 
+## IS PARSED!!  This means that lines with stray characters or lines that
+## use non # comment characters will be interpreted by the initscript.
+## This has probably minor, but potentially serious, side effects for your
+## hard drives, so please follow the guidelines.  Patches to improve
+## flexibilty welcome.  Please read /usr/share/doc/hdparm/README.Debian for
  ## notes about known issues, especially if you have an MD array.
  ##
-## Note that if the init script causes boot problems, you can pass 'nohdparm' 
+## Note that if the init script causes boot problems, you can pass 'nohdparm'
  ## on the kernel command line, and the script will not be run.
  ##
  ## Uncommenting the options below will cause them to be added to the DEFAULT
@@ -30,7 +30,7 @@
  ## outside of a block and all options defined with in the block.
  
  # -q be quiet
-quiet 
+quiet
  # -a sector count for filesystem read-ahead
  #read_ahead_sect = 12
  # -A disable/enable the IDE drive's read-lookahead feature
@@ -59,6 +59,8 @@ quiet
  #prefetch_sect = 12
  # -r read-only flag for device
  #read_only = off
+# -R Enable/Disable Write-Read-Verify, on to enable (R1), off to disable (R0)
+# write_read_verify = off
  # -s Turn on/off power on in standby mode
  # poweron_standby = off
  # -S standby (spindown) timeout for the drive
@@ -95,20 +97,20 @@ quiet
  # Root file systems.  Please see README.Debian for details
  # ROOTFS = /dev/hda
  
-## New note - you can use straight hdparm commands in this config file 
+## New note - you can use straight hdparm commands in this config file
  ## as well - the set up is ugly, but it keeps backwards compatibility
-## Additionally, it should be noted that any blocks that begin with 
+## Additionally, it should be noted that any blocks that begin with
  ## the keyword 'command_line' are not run until after the root filesystem
-## is mounted.  This is done to avoid running blocks twice.  If you need 
-## to run hdparm to set parameters for your root disk, please use the 
+## is mounted.  This is done to avoid running blocks twice.  If you need
+## to run hdparm to set parameters for your root disk, please use the
  ## standard format.
  
  #Samples follow:
-#First three are good for devfs systems, fourth one for systems that do 
+#First three are good for devfs systems, fourth one for systems that do
  #not use devfs.  The fifth example uses straight hdparm command line
  #syntax.  Any of the blocks that use command line syntax must begin with
-#the keyword 'command_line', and no attempt is made to validate syntax.  
-#It is provided for those more comfortable with hdparm syntax. 
+#the keyword 'command_line', and no attempt is made to validate syntax.
+#It is provided for those more comfortable with hdparm syntax.
  
  #/dev/discs/disc0/disc {
  #      mult_sect_io = 16
@@ -123,7 +125,7 @@ quiet
  #}
  
  #/dev/cdroms/cdrom0 {
-#      dma = on                   
+#      dma = on
  #      interrupt_unmask = on
  #      io32_support = 0
  #}
diff --git a/init.d/acpid b/init.d/acpid

index a298693efb75cfdafb90725d4eaf5065cec964a3..0ce15f8c4138b376fa8fe4c5b1a489da30227c30 100755 (executable)
--- a/init.d/acpid
+++ b/init.d/acpid
@@ -49,15 +49,17 @@ load_modules() {
      log_end_msg $?
  }
  
+set +e
+
  case "$1" in
    start)
      load_modules || true
-    log_begin_msg "Starting ACPI services..."
+    log_daemon_msg "Starting ACPI services" "acpid"
      start-stop-daemon --start --quiet --oknodo --exec "$ACPID" -- $OPTIONS
      log_end_msg $?
      ;;
    stop)
-    log_begin_msg "Stopping ACPI services..."
+    log_daemon_msg "Stopping ACPI services" "acpid"
      start-stop-daemon --stop --quiet --oknodo --retry 2 --exec "$ACPID"
      log_end_msg $?
      ;;
@@ -67,7 +69,7 @@ case "$1" in
      $0 start
      ;;
    reload|force-reload) 
-    log_begin_msg "Reloading ACPI services..."
+    log_daemon_msg "Reloading ACPI services" "acpid"
      start-stop-daemon --stop --signal 1 --exec "$ACPID"
      log_end_msg $?
      ;;
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/console-setup.sh b/init.d/console-setup.sh

new file mode 100755 (executable)

index 0000000..292d831
--- /dev/null
+++ b/init.d/console-setup.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          console-setup.sh
+# Required-Start:    $remote_fs
+# Required-Stop:
+# Should-Start:      console-screen kbd
+# Default-Start:     2 3 4 5
+# Default-Stop:
+# X-Interactive:     true
+# Short-Description: Set console font and keymap
+### END INIT INFO
+
+if [ -f /bin/setupcon ]; then
+    case "$1" in
+        stop|status)
+        # console-setup isn't a daemon
+        ;;
+        start|force-reload|restart|reload)
+            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
+            log_action_begin_msg "Setting up console font and keymap"
+            if /lib/console-setup/console-setup.sh; 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 3
+            ;;
+    esac
+fi
diff --git a/init.d/cryptdisks-early b/init.d/cryptdisks-early

index e26716e498ab786b0740e63371aa9d27c6d9c4d7..05e9c0e8f82ad5a4377c4a3a61f95ecfd5116c39 100755 (executable)
--- a/init.d/cryptdisks-early
+++ b/init.d/cryptdisks-early
@@ -25,6 +25,9 @@ fi
  INITSTATE="early"
  DEFAULT_LOUD=""
  
+# Create LUKS2 locking directory
+install -oroot -groot -m0700 -d /run/cryptsetup
+
  case "$CRYPTDISKS_ENABLE" in
  [Nn]*)
         exit 0
diff --git a/init.d/grub-common b/init.d/grub-common

index 9734b1f689ee2c671ab7af1d997c9f456d8b4491..3e80af4727abe3857fee59c0690bc88d289fb927 100755 (executable)
--- a/init.d/grub-common
+++ b/init.d/grub-common
@@ -13,20 +13,17 @@
  
  which grub-editenv >/dev/null 2>&1 || exit 0
  
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
  # Define LSB log_* functions.
  # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
  . /lib/lsb/init-functions
  
  case $1 in
      start|restart|force-reload)
-       [ "$VERBOSE" != no ] && log_action_msg "Recording successful boot for GRUB"
+       log_action_msg "Recording successful boot for GRUB"
         [ -s /boot/grub/grubenv ] || rm -f /boot/grub/grubenv
         mkdir -p /boot/grub
         grub-editenv /boot/grub/grubenv unset recordfail
-       [ "$VERBOSE" != no ] && log_end_msg $?
+       log_end_msg $?
         ;;
      stop)
         ;;
diff --git a/init.d/irqbalance b/init.d/irqbalance

index eed562fe4af983847edfeef672c7866bfc332fd7..8ebf8e04a51767f75d56c228efc0874cc040a3d6 100755 (executable)
--- a/init.d/irqbalance
+++ b/init.d/irqbalance
@@ -18,12 +18,11 @@ DAEMON=/usr/sbin/irqbalance
  NAME=irqbalance
  SNAME=irqbalance
  DESC="SMP IRQ Balancer"
-PIDFILE="/var/run/$NAME.pid"
+PIDFILE="/run/$NAME.pid"
  PNAME="irqbalance"
  DOPTIONS=""
  
  # Defaults - don't touch, edit /etc/default/
-ENABLED=0
  OPTIONS=""
  ONESHOT=0
  
@@ -33,20 +32,23 @@ test -x $DAEMON || exit 0
  
  test -f /etc/default/irqbalance && . /etc/default/irqbalance
  
-test "$ENABLED" != "0" || exit 0
-
-if test "$ONESHOT" != "0"; then
+# Beware: irqbalance tries to read and handle environment variables
+# directly itself, but since start-stop-daemon clears the env
+# we convert the variables to commandline arguments here...
+# (Note: in the daemon an option is enabled even if its set to
+#  e.g. the empty string or 0 or whatever. To disable it should not
+#  be exported at all!)
+# Warning: this will need to be maintained and updated on upgrades
+#          to new upstream release which might introduce new ones!
+if [ ! -z ${IRQBALANCE_ONESHOT+x} ]; then
      DOPTIONS="--oneshot"
  fi
+if [ ! -z ${IRCBALANCE_ARGS+x} ]; then
+       OPTIONS="$OPTIONS $IRQBALANCE_ARGS"
+fi
  
  case "$1" in
      start)
-        if [ -x /usr/bin/systemd-detect-virt ] && /usr/bin/systemd-detect-virt --quiet --container; then
-            log_daemon_msg "Not starting $NAME in container"
-            log_end_msg 0
-            exit 0
-        fi
-
          log_begin_msg "Starting $DESC: $NAME"
  
          pid=$( pidofproc -p $PIDFILE $DAEMON )
@@ -69,12 +71,6 @@ case "$1" in
          log_end_msg $?
          ;;
      restart|force-reload)
-        if [ -x /usr/bin/systemd-detect-virt ] && /usr/bin/systemd-detect-virt --quiet --container; then
-            log_daemon_msg "Not restarting $NAME in container"
-            log_end_msg 0
-            exit 0
-        fi
-
          log_begin_msg "Restarting $DESC: $NAME"
  
          start-stop-daemon --stop --retry 5 --quiet --oknodo --exec $DAEMON
diff --git a/init.d/keyboard-setup.sh b/init.d/keyboard-setup.sh

new file mode 100755 (executable)

index 0000000..f1ab5ba
--- /dev/null
+++ b/init.d/keyboard-setup.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          keyboard-setup.sh
+# Required-Start:    mountkernfs
+# Required-Stop:
+# X-Start-Before:    checkroot
+# Default-Start:     S
+# Default-Stop:
+# X-Interactive:     true
+# Short-Description: Set the console keyboard layout
+# 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
+
+if [ -f /bin/setupcon ]; then
+    case "$1" in
+        stop|status)
+        # console-setup isn't a daemon
+        ;;
+        start|force-reload|restart|reload)
+            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
+           log_action_begin_msg "Setting up keyboard layout"
+            if /lib/console-setup/keyboard-setup.sh; then
+               log_action_end_msg 0
+           else
+               log_action_end_msg $?
+           fi
+           ;;
+        *)
+            echo 'Usage: /etc/init.d/keyboard-setup {start|reload|restart|force-reload|stop|status}'
+            exit 3
+            ;;
+    esac
+fi
diff --git a/init.d/kmod b/init.d/kmod

index 1350481287ce705944b3b64f1ba5c48e4b12a24b..d7ec083cbfb2e6f7bd71bd47ac86614197f16219 100755 (executable)
--- a/init.d/kmod
+++ b/init.d/kmod
@@ -22,9 +22,6 @@ PATH='/sbin:/bin'
  
  case "$1" in
    start)
-  if init_is_upstart; then
-    exit 1
-  fi
    ;;
  
    stop|restart|reload|force-reload)
diff --git a/init.d/lm-sensors b/init.d/lm-sensors

index e6db98b36cc91e4f64d9d17ef13857d67d986d68..3f9ed723cf8cd6b5f9af9b1dccc61de6bc42cba8 100755 (executable)
--- a/init.d/lm-sensors
+++ b/init.d/lm-sensors
@@ -20,7 +20,7 @@ test -x $PROGRAM || exit 0
  
  case "$1" in
    start)
-       log_begin_msg "Setting sensors limits"
+       log_action_begin_msg "Setting sensors limits"
         if [ "$VERBOSE" = "no" ]; then
                 /usr/bin/sensors -s 1> /dev/null 2> /dev/null
                 /usr/bin/sensors 1> /dev/null 2> /dev/null
@@ -28,7 +28,7 @@ case "$1" in
                 /usr/bin/sensors -s
                 /usr/bin/sensors > /dev/null
         fi
-       log_end_msg 0
+       log_action_end_msg 0
         ;;
    stop)
         ;;
diff --git a/init.d/networking b/init.d/networking

index 6087bc5d4581178cc98c5e7f57c0d81c580c0244..ec00e979be7f8e7e0f44987b8e0225ca224d72c4 100755 (executable)
--- a/init.d/networking
+++ b/init.d/networking
@@ -107,12 +107,7 @@ ifup_hotplug () {
                                     link=${link##.*}
                                     if [ -e "/sys/class/net/$link" ]
                                     then
-                                       # link detection does not work unless we up the link
-                                       ip link set "$iface" up || true
-                                       if [ "$(cat /sys/class/net/$link/operstate)" = up ]
-                                       then
-                                           echo "$iface"
-                                       fi
+                                       echo "$iface"
                                     fi
                             done)
             if [ -n "$ifaces" ]
diff --git a/init.d/psad b/init.d/psad

index 33ca283dfb21fcd9875405a67aafaca4e482583c..a670e0fc1e2cbad2c92258dfb31fbad785ce746b 100755 (executable)
--- a/init.d/psad
+++ b/init.d/psad
@@ -3,6 +3,7 @@
  # Provides:          psad
  # Required-Start:    $remote_fs
  # Required-Stop:     $remote_fs
+# Should-Start:      netfilter-persistent
  # Default-Start:     2 3 4 5
  # Default-Stop:      0 1 6
  # Short-Description: Port Scan Attack Detector (psad)
@@ -134,7 +135,8 @@ do_start()
  # The upstream author has allowed the daemon to be killed through the 
  # following command-line : psad --Kill
  #
-# As psad starts kmsgsd and psadwatchd on its own, we need to stop them before.
+# As psad starts kmsgsd, psadwatchd and psad_fw_read on its own, we need
+# to stop them before.
  #
  # Return
  #   0 : daemon has been stopped or was already stopped
@@ -145,7 +147,7 @@ do_stop()
         local retval="0"
         local status kill_status
         local pid pidfile
-       local process_list="psadwatchd kmsgsd psad"
+       local process_list="psadwatchd kmsgsd psad psad_fw_read"
  
         # For each process
         for process in $process_list; do
@@ -215,7 +217,7 @@ case "$1" in
  
         status)
                 do_status
-               exit $?
+               exit 0
                 ;;
  
         *)
diff --git a/init.d/screen-cleanup b/init.d/screen-cleanup

index 19c55118f0d935f53f31e993fa61e5e63a18c1da..3eb41855c4dbea7e3bda69406d8c8e8d0f5f3be4 100755 (executable)
--- a/init.d/screen-cleanup
+++ b/init.d/screen-cleanup
@@ -19,7 +19,7 @@ set -e
  
  test -f /usr/bin/screen || exit 0
  
-SCREENDIR=/var/run/screen
+SCREENDIR=/run/screen
  
  case "$1" in
  start)
diff --git a/init.d/ufw b/init.d/ufw

index 0c22b275aa5887ad25cb343c6514a875cc0744b1..c491994300be20bfec289da90d4814cc5556524f 100755 (executable)
--- a/init.d/ufw
+++ b/init.d/ufw
@@ -7,6 +7,7 @@
  # Default-Start:     S
  # Default-Stop:      1
  # Short-Description: start firewall
+# Description: Start ufw firewall
  ### END INIT INFO
  
  set -e
diff --git a/init/acpid.conf b/init/acpid.conf

deleted file mode 100644 (file)

index 24e0d96..0000000
--- a/init/acpid.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# acpid - ACPI daemon
-#
-# The ACPI daemon provides a socket for other daemons to multiplex kernel
-# ACPI events from, and a framework for reacting to those events.
-
-description    "ACPI daemon"
-
-start on runlevel [2345] and not-container
-stop on runlevel [!2345]
-
-expect fork
-respawn
-
-exec acpid -c /etc/acpi/events -s /var/run/acpid.socket
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/cryptdisks-udev.conf b/init/cryptdisks-udev.conf

deleted file mode 100644 (file)

index 4d7c342..0000000
--- a/init/cryptdisks-udev.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# cryptdisks - enable encrypted block devices
-
-description    "enable encrypted block devices"
-
-start on block-device-added ID_FS_USAGE=crypto
-instance $DEVNAME
-
-task
-
-script
-       if [ -r /lib/cryptsetup/cryptdisks.functions ]; then
-               . /lib/cryptsetup/cryptdisks.functions
-       else
-               exit 0
-       fi
-
-       case "$CRYPTDISKS_ENABLE" in
-       [Nn]*)
-               exit 1
-               ;;
-       esac
-
-       INITSTATE=udev
-       crypttab_start_one_disk "$DEVNAME"
-end script
diff --git a/init/cryptdisks.conf b/init/cryptdisks.conf

deleted file mode 100644 (file)

index f2d5b18..0000000
--- a/init/cryptdisks.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-# cryptdisks - enable encrypted block devices
-#
-# Sweep up any devices in /etc/crypttab that have not yet been started at
-# the end of udev coldplugging; this partly duplicates the cryptdisks-udev
-# job, but is necessary because:
-#  - some devices may not be registered as ID_FS_USAGE=crypto by udev (e.g.,
-#    random-encrypted devices), but we don't want to call the upstart job
-#    for every single block device
-#  - some devices can only be decrypted after other devices are decrypted and
-#    mounted first, so we need a two-pass system (like
-#    /etc/init.d/cryptdisks{,-early} previously)
-#
-# This job currently still does not guarantee a race-free startup; instances
-# of cryptdisks-udev may be started in parallel with this job.
-
-description    "enable remaining boot-time encrypted block devices"
-
-start on stopped udevtrigger or container
-
-# Currently stopping is a no-op, so we can stop this anywhere during the
-# shutdown sequence.  We let the cryptdisks-early init script take care of
-# device teardown instead; it happens that the distinction between the
-# 'cryptdisks' and 'cryptdisks-early' jobs is irrelevant on shutdown because
-# the only sequencing difference is lvm2, which has no init script that's
-# called on shutdown.
-stop on unmounted-remote-filesystems
-
-task
-
-pre-start script
-       if [ -r /lib/cryptsetup/cryptdisks.functions ]; then
-               . /lib/cryptsetup/cryptdisks.functions
-       else
-               exit 0
-       fi
-
-       case "$CRYPTDISKS_ENABLE" in
-       [Nn]*)
-               exit 1
-               ;;
-       esac
-
-       INITSTATE="init"
-       do_start
-end script
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/friendly-recovery.conf b/init/friendly-recovery.conf

deleted file mode 100644 (file)

index f511fdf..0000000
--- a/init/friendly-recovery.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-# Init script for friendly recovery
-
-start on recovery
-
-console owner
-task
-
-emits recovery
-emits startup
-emits mounted
-
-pre-start script
-    if plymouth --ping; then
-        plymouth hide-splash || true
-    fi
-
-    # Try to set the hostname and initialize the console
-    start hostname || true
-    start console-setup || true
-    start setvtrgb || true
-
-    # Make sure /run contains the required directories for the
-    # recovery menu options
-    mkdir -p /run/lock /run/shm || true
-
-    # Emit the mounted event to trigger resolvconf and mounted-run
-    initctl emit mounted MOUNTPOINT=/run || true
-
-    # Finally start udev
-    start udev || true
-    udevadm trigger --action=add || true
-    udevadm settle || true
-
-    # And turn off kernel messages (to avoid corrupting the menu)
-    dmesg --console-off || true
-end script
-
-script
-    # Only start friendly-recovery when booting in recovery mode
-    if ! grep -q "recovery" /proc/cmdline; then
-        exit 0
-    fi
-
-    if [ -x /lib/recovery-mode/recovery-menu ]; then
-        exec /lib/recovery-mode/recovery-menu
-    else
-        exec /sbin/sulogin
-    fi
-end script
-
-post-stop script
-    if plymouth --ping; then
-        plymouth show-splash
-    fi
-    initctl emit startup
-end script
-
diff --git a/init/irqbalance.conf b/init/irqbalance.conf

deleted file mode 100644 (file)

index c7b81fe..0000000
--- a/init/irqbalance.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# irqbalance - Daemon to balance interrupts for SMP system
-
-# irqbalance is a daemon to balance interrupts across multiple CPUs, which 
-# can lear to better performance and IO balance on SMP systems.
-
-description    "CPU interrupts balancing daemon"
-author         "Chuck Short <zulcss@ubuntu.com>"
-
-start on runlevel [2345] and not-container
-stop on runlevel [!2345]
-
-expect fork
-
-script 
-       test -f /etc/default/irqbalance && . /etc/default/irqbalance
-
-       test "$ENABLED" != "0" || exit 0
-
-       if test "$ONESHOT" != "0"; then
-               DOPTIONS="--oneshot"
-       fi
-
-       exec /usr/sbin/irqbalance $OPTIONS $DOPTIONS
-
-end script
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/network-interface-container.conf b/init/network-interface-container.conf

deleted file mode 100644 (file)

index 9bc6eef..0000000
--- a/init/network-interface-container.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# network-interface-container - woarkound for missing events in container
-#
-# This service emits missing net-device-added events for containers.
-# It's needed in cases where devices are created before the container
-# starts and so won't get a udev event.
-
-description "workaround for missing events in container"
-start on container
-
-emits net-device-added
-
-task
-script
-    case "$CONTAINER" in
-        lxc|lxc-libvirt|openvz)
-            initctl emit --no-wait net-device-added INTERFACE=lo || true
-        ;;
-    esac
-end script
diff --git a/init/network-interface-security.conf b/init/network-interface-security.conf

deleted file mode 100644 (file)

index 7bf829f..0000000
--- a/init/network-interface-security.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# network-interface-security - configure network device security
-#
-# This is a one-time start-up script to load AppArmor profiles needed
-# before the network comes up.
-
-description    "configure network device security"
-
-# In order to avoid upstart bug LP: #447654, we cannot have an AND
-# statement here (with the ORs).  An "and virtual-filesystems" is desired
-# here to make sure that the securityfs is mounted, but since each of the
-# ORed services already require virtual-filesystems be mounted, this is safe:
-start on (starting network-interface
-          or starting network-manager
-          or starting networking)
-stop on (stopped network-interface JOB=$JOB INTERFACE=$INTERFACE
-          or stopped network-manager JOB=$JOB
-          or stopped networking JOB=$JOB)
-
-# In order to handle the lack of upstart feature LP: #568860, we need to
-# run multiple times, for each of the above "starting" service instances, or
-# else another one might run while we're running, and not wait for us to
-# finish.
-instance $JOB${INTERFACE:+/}${INTERFACE:-}
-
-# Since we need these profiles to be loaded before any of the above services
-# begin running, this service must be a pre-start so that its pre-start
-# script finishes before the above services' start scripts begin.
-pre-start script
-    [ -f /run/network-interface-security ] && exit 0 # already ran
-    [ -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
-    for link in /etc/apparmor/init/network-interface-security/* ; do
-        [ -L $link ] && /sbin/apparmor_parser -r -W $link || true
-    done
-    > /run/network-interface-security
-end script
diff --git a/init/network-interface.conf b/init/network-interface.conf

deleted file mode 100644 (file)

index 9a3cbd3..0000000
--- a/init/network-interface.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# network-interface - configure network device
-#
-# This service causes network devices to be brought up or down as a result
-# of hardware being added or removed, including that which isn't ordinarily
-# removable.
-
-description    "configure network device"
-
-emits net-device-up
-emits net-device-down
-emits static-network-up
-
-start on net-device-added
-stop on net-device-removed INTERFACE=$INTERFACE
-
-instance $INTERFACE
-export INTERFACE
-
-pre-start script
-    if [ "$INTERFACE" = lo ]; then
-        # bring this up even if /etc/network/interfaces is broken
-        ifconfig lo 127.0.0.1 up || true
-        initctl emit -n net-device-up \
-            IFACE=lo LOGICAL=lo ADDRFAM=inet METHOD=loopback || true
-    fi
-    mkdir -p /run/network
-    ifup --allow auto $INTERFACE
-    ifup --allow hotplug $INTERFACE
-end script
-
-post-stop script
-    ifdown --force --allow auto $INTERFACE
-    ifdown --force --allow hotplug $INTERFACE
-end script
diff --git a/init/networking.conf b/init/networking.conf

deleted file mode 100644 (file)

index bf76854..0000000
--- a/init/networking.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-# networking - configure virtual network devices
-#
-# This task causes virtual network devices that do not have an associated
-# kernel object to be started on boot.
-
-description    "configure virtual network devices"
-
-emits static-network-up
-emits net-device-up
-emits deconfiguring-networking
-
-start on (local-filesystems
-    and (stopped udevtrigger or container)) or runlevel [2345] or stopped networking RESULT=failed PROCESS=post-stop EXIT_STATUS=100
-stop on unmounted-remote-filesystems
-
-pre-start script
-    if [ "$UPSTART_EVENTS" = "stopped" ] && [ "$UPSTART_JOB" = "networking" ] && [ "$EXIT_STATUS" = "100" ]; then
-        exit 0
-    fi
-
-    mkdir -p /run/network
-    ifup -a
-end script
-
-post-stop script
-    if [ -z "$UPSTART_STOP_EVENTS" ]; then
-        echo "Stopping or restarting the networking job is not supported."
-        echo "Use ifdown & ifup to reconfigure desired interface."
-        exit 100
-    fi
-
-    log_warning_msg() {
-        echo $*
-    }
-
-    # These checks were taken from the Debian ifupdown.networking.init script
-    check_network_file_systems() {
-        [ -e /proc/mounts ] || return 0
-
-        if [ -e /etc/iscsi/iscsi.initramfs ]; then
-            log_warning_msg "not deconfiguring network interfaces: iSCSI root is mounted."
-            exit 0
-        fi
-
-        while read DEV MTPT FSTYPE REST; do
-            case $DEV in
-            /dev/nbd*|/dev/nd[a-z]*|/dev/etherd/e*)
-                log_warning_msg "not deconfiguring network interfaces: network devices still mounted."
-                exit 0
-                ;;
-            esac
-            case $FSTYPE in
-            nfs|nfs4|smbfs|ncp|ncpfs|cifs|coda|ocfs2|gfs|pvfs|pvfs2|fuse.httpfs|fuse.curlftpfs)
-                log_warning_msg "not deconfiguring network interfaces: network file systems still mounted."
-                exit 0
-                ;;
-            esac
-        done < /proc/mounts
-    }
-
-    check_network_swap() {
-        [ -e /proc/swaps ] || return 0
-
-        while read DEV MTPT FSTYPE REST; do
-            case $DEV in
-            /dev/nbd*|/dev/nd[a-z]*|/dev/etherd/e*)
-                log_warning_msg "not deconfiguring network interfaces: network swap still mounted."
-                exit 0
-                ;;
-            esac
-        done < /proc/swaps
-    }
-
-    check_network_file_systems
-    check_network_swap
-
-    # Anything that manages network interfaces *MUST* wait for this event
-    initctl emit deconfiguring-networking
-    ifdown -a --exclude=lo
-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/resolvconf.conf b/init/resolvconf.conf

deleted file mode 100644 (file)

index 9346011..0000000
--- a/init/resolvconf.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# upstart script for resolvconf
-
-description "Initialize or finalize resolvconf"
-
-start on mounted MOUNTPOINT=/run
-
-stop on runlevel [06]
-
-pre-start script
-       mkdir -p /run/resolvconf/interface
-       # Request a postponed update (needed in case the base file has content).
-       touch /run/resolvconf/postponed-update
-       # Enable updates and perform the postponed update.
-       resolvconf --enable-updates
-end script
-
-post-stop script
-       resolvconf --disable-updates
-end script
diff --git a/init/rfkill-restore.conf b/init/rfkill-restore.conf

deleted file mode 100644 (file)

index b106f0b..0000000
--- a/init/rfkill-restore.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# rfkill-restore - restore software RF kill switch state
-
-description    "restore software rfkill state"
-
-start on local-filesystems
-
-task
-
-script
-    if [ ! -d /sys/class/rfkill ]; then
-        exit 0
-    fi
-    for device in /sys/class/rfkill/*; do
-        [ ! -d $device ] && continue
-        /lib/systemd/systemd-rfkill load `basename $device`
-    done
-end script
diff --git a/init/rfkill-store.conf b/init/rfkill-store.conf

deleted file mode 100644 (file)

index 1b07ae4..0000000
--- a/init/rfkill-store.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# rfkill-store - store software RF kill switch state
-
-description    "store software rfkill state"
-
-start on runlevel [016]
-
-task
-
-script
-    if [ ! -d /sys/class/rfkill ]; then
-        exit 0
-    fi
-
-    for device in /sys/class/rfkill/*; do
-        [ ! -d $device ] && continue
-        /lib/systemd/systemd-rfkill save `basename $device`
-    done
-end script
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/init/ufw.conf b/init/ufw.conf

deleted file mode 100644 (file)

index 9d5dad2..0000000
--- a/init/ufw.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# ufw - Uncomplicated Firewall
-#
-# The Uncomplicated Firewall is a front-end for iptables, to make managing a
-# Netfilter firewall easier.
-
-description    "Uncomplicated firewall"
-
-# Make sure we start before an interface receives traffic
-start on (starting network-interface
-          or starting network-manager
-          or starting networking)
-
-stop on runlevel [!023456]
-
-console output
-
-pre-start exec /lib/ufw/ufw-init start quiet
-post-stop exec /lib/ufw/ufw-init stop
diff --git a/init/ureadahead-other.conf b/init/ureadahead-other.conf

deleted file mode 100644 (file)

index d4a3504..0000000
--- a/init/ureadahead-other.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# ureadahead - Read required files in advance for other mountpoints
-#
-# Runs the über-readahead daemon which reads data about files required
-# during boot and reads them into the page cache in advance of their
-# use.
-
-description    "Read required files in advance (for other mountpoints)"
-
-start on mounted DEVICE=[/UL]* MOUNTPOINT=/?*
-
-# Forks into the background both when reading from disk and when profiling
-# (HDD mode won't fork, but that's ok because we'll wait for it in spawned).
-expect fork
-
-# Don't treat a normal exit after reading finishes as a failure, and
-# don't treat a missing pack file as an error either
-normal exit 0 4
-
-exec /sbin/ureadahead --daemon $MOUNTPOINT
diff --git a/init/ureadahead.conf b/init/ureadahead.conf

deleted file mode 100644 (file)

index e95e49a..0000000
--- a/init/ureadahead.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# ureadahead - Read required files in advance
-#
-# Runs the über-readahead daemon which reads data about files required
-# during boot and reads them into the page cache in advance of their
-# use.
-
-description    "Read required files in advance"
-
-start on starting mountall
-stop on stopped rc
-
-# Forks into the background both when reading from disk and when profiling
-# (HDD mode won't fork, but that's ok because we'll wait for it in spawned).
-expect fork
-
-# When profiling, give it three minutes after sending SIGTERM to write out
-# the pack file.
-kill timeout 180
-
-# Don't treat a normal exit after reading finishes as a failure
-normal exit 0
-
-exec /sbin/ureadahead --daemon
-
-# Normally ureadahead will exit on its own when it finishes, unless it's
-# profiling - in which case we want to give the system another 45s to
-# finish staring the desktop and other things.
-pre-stop exec sleep 45
diff --git a/issue b/issue

index 8df41eaaa0e9bc1ba2518d86f9d1cf83606daa59..cdfba6c1e800ffa4d9a12e21ab0cff1e53c315e8 100644 (file)
--- a/issue
+++ b/issue
@@ -1,2 +1,2 @@
-Ubuntu 16.04.5 LTS \n \l
+Ubuntu 18.04.1 LTS \n \l
  
diff --git a/issue.net b/issue.net

index f9bd4bfe822662e97395ee6794abb7058d9a6d1a..b02896401f6cd37d7c681c5dd9e0032231299785 100644 (file)
--- a/issue.net
+++ b/issue.net
@@ -1 +1 @@
-Ubuntu 16.04.5 LTS
+Ubuntu 18.04.1 LTS
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/kernel/postinst.d/unattended-upgrades b/kernel/postinst.d/unattended-upgrades

index 7a995b486e4246418c8b2251b008d260c99d64b3..1304a895b0335f34f8d456b0e91879454e271167 100755 (executable)
--- a/kernel/postinst.d/unattended-upgrades
+++ b/kernel/postinst.d/unattended-upgrades
@@ -1,5 +1,10 @@
  #!/bin/sh
  
+case "$DPKG_MAINTSCRIPT_PACKAGE::$DPKG_MAINTSCRIPT_NAME" in
+   linux-image-extra*::postrm)
+      exit 0;;
+esac
+
  if [ -d /var/run ]; then
     touch /var/run/reboot-required
  fi
diff --git a/lintianrc b/lintianrc

index 21a44fd342860ced96a12bfd6773eb3af8685a7e..76f781e43a13a283ab42aa186797b97e1f6a1cdd 100644 (file)
--- a/lintianrc
+++ b/lintianrc
@@ -16,6 +16,9 @@
  # Enable info tags by default (--display info)
  #display-info = yes
  
+# Limit the number of parallel unpacking jobs to X (--jobs)
+#jobs = 8
+
  # Enable pedantic tags by default (--pedantic)
  #pedantic = yes
  
@@ -40,3 +43,9 @@
  # Use a different directory for temporary files - useful if /tmp is a
  # tmpfs with "limited" capacity.
  #TMPDIR="/var/tmp"
+
+# Suppress the listed tags (--suppress-tags)
+#suppress-tags = debian-watch-does-not-check-gpg-signature
+ 
+# Specify "tag per package" display limit (--tag-display-limit)
+#tag-display-limit = 42
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 e34bc4dbb779c91a0736df3bf10d802cbfc2a5e3..75bb955d39067e912d4f7ad48e6440d9f7bef1af 100644 (file)
--- a/lsb-release
+++ b/lsb-release
@@ -1,4 +1,4 @@
  DISTRIB_ID=Ubuntu
-DISTRIB_RELEASE=16.04
-DISTRIB_CODENAME=xenial
-DISTRIB_DESCRIPTION="Ubuntu 16.04.5 LTS"
+DISTRIB_RELEASE=18.04
+DISTRIB_CODENAME=bionic
+DISTRIB_DESCRIPTION="Ubuntu 18.04.1 LTS"
diff --git a/lvm/backup/ubuntu-vg b/lvm/backup/ubuntu-vg

index a1415f4dd11b93349a61005388dd44c2f4ca83db..c3a091849a489127af7a9e4fc1d411579640b2ff 100644 (file)
--- a/lvm/backup/ubuntu-vg
+++ b/lvm/backup/ubuntu-vg
@@ -1,12 +1,12 @@
-# Generated by LVM2 version 2.02.133(2) (2015-10-30): Mon Jun  5 03:34:11 2017
+# Generated by LVM2 version 2.02.176(2) (2017-11-03): Fri Aug 24 15:23:51 2018
  
  contents = "Text Format Volume Group"
  version = 1
  
-description = "Created *after* executing 'pvscan --cache --activate ay --major 253 --minor 0'"
+description = "Created *after* executing 'vgcfgbackup'"
  
-creation_host = "zenbook"      # Linux zenbook 4.8.0-36-generic #36~16.04.1-Ubuntu SMP Sun Feb 5 09:39:57 UTC 2017 x86_64
-creation_time = 1496626451     # Mon Jun  5 03:34:11 2017
+creation_host = "zenbook"      # Linux zenbook 4.10.0-32-generic #36~16.04.1-Ubuntu SMP Wed Aug 9 09:19:02 UTC 2017 x86_64
+creation_time = 1535117031     # Fri Aug 24 15:23:51 2018
  
  ubuntu-vg {
         id = "iGNPYk-QMOA-fa9p-L6CG-71WP-vdqm-C1xbGg"
@@ -27,9 +27,9 @@ ubuntu-vg {
  
                         status = ["ALLOCATABLE"]
                         flags = []
-                       dev_size = 1873330176   # 893.273 Gigabytes
+                       dev_size = 1873330176   # 893,273 Gigabytes
                         pe_start = 2048
-                       pe_count = 228677       # 893.27 Gigabytes
+                       pe_count = 228677       # 893,27 Gigabytes
                 }
         }
  
@@ -39,13 +39,13 @@ ubuntu-vg {
                         id = "3Npc3o-x67v-zufz-lNNA-HkdY-ITQ2-cvuW6A"
                         status = ["READ", "WRITE", "VISIBLE"]
                         flags = []
-                       creation_host = "ubuntu"
                         creation_time = 1496618914      # 2017-06-05 01:28:34 +0200
+                       creation_host = "ubuntu"
                         segment_count = 1
  
                         segment1 {
                                 start_extent = 0
-                               extent_count = 226649   # 885.348 Gigabytes
+                               extent_count = 226649   # 885,348 Gigabytes
  
                                 type = "striped"
                                 stripe_count = 1        # linear
@@ -60,13 +60,13 @@ ubuntu-vg {
                         id = "N3j11q-aYga-TXLQ-3YWu-ewno-wbX4-PCX9G4"
                         status = ["READ", "WRITE", "VISIBLE"]
                         flags = []
-                       creation_host = "ubuntu"
                         creation_time = 1496618914      # 2017-06-05 01:28:34 +0200
+                       creation_host = "ubuntu"
                         segment_count = 1
  
                         segment1 {
                                 start_extent = 0
-                               extent_count = 2017     # 7.87891 Gigabytes
+                               extent_count = 2017     # 7,87891 Gigabytes
  
                                 type = "striped"
                                 stripe_count = 1        # linear
@@ -77,4 +77,5 @@ ubuntu-vg {
                         }
                 }
         }
+
  }
diff --git a/lvm/lvm.conf b/lvm/lvm.conf

index aeae63fbc669777388338cdccfce8dc7037bfd34..0c0635929bd54af45db356f52ca732f32b3709d6 100644 (file)
--- a/lvm/lvm.conf
+++ b/lvm/lvm.conf
@@ -299,6 +299,19 @@ devices {
         # generally do. If enabled, discards will only be issued if both the
         # storage and kernel provide support.
         issue_discards = 1
+
+       # Configuration option devices/allow_changes_with_duplicate_pvs.
+       # Allow VG modification while a PV appears on multiple devices.
+       # When a PV appears on multiple devices, LVM attempts to choose the
+       # best device to use for the PV. If the devices represent the same
+       # underlying storage, the choice has minimal consequence. If the
+       # devices represent different underlying storage, the wrong choice
+       # can result in data loss if the VG is modified. Disabling this
+       # setting is the safest option because it prevents modifying a VG
+       # or activating LVs in it while a PV appears on multiple devices.
+       # Enabling this setting allows the VG to be used as usual even with
+       # uncertain devices.
+       allow_changes_with_duplicate_pvs = 0
  }
  
  # Configuration section allocation.
@@ -364,10 +377,30 @@ allocation {
         # The default setting changed in version 2.02.85.
         mirror_logs_require_separate_pvs = 0
  
+       # Configuration option allocation/raid_stripe_all_devices.
+       # Stripe across all PVs when RAID stripes are not specified.
+       # If enabled, all PVs in the VG or on the command line are used for
+       # raid0/4/5/6/10 when the command does not specify the number of
+       # stripes to use.
+       # This was the default behaviour until release 2.02.162.
+       # This configuration option has an automatic default value.
+       # raid_stripe_all_devices = 0
+
         # Configuration option allocation/cache_pool_metadata_require_separate_pvs.
         # Cache pool metadata and data will always use different PVs.
         cache_pool_metadata_require_separate_pvs = 0
  
+       # Configuration option allocation/cache_metadata_format.
+       # Sets default metadata format for new cache.
+       # 
+       # Accepted values:
+       #   0  Automatically detected best available format
+       #   1  Original format
+       #   2  Improved 2nd. generation format
+       # 
+       # This configuration option has an automatic default value.
+       # cache_metadata_format = 0
+
         # Configuration option allocation/cache_mode.
         # The default cache mode used for new cache.
         # 
@@ -384,7 +417,7 @@ allocation {
  
         # Configuration option allocation/cache_policy.
         # The default cache policy used for new cache volume.
-       # Since kernel 4.2 the default policy is smq (Stochastic multique),
+       # Since kernel 4.2 the default policy is smq (Stochastic multiqueue),
         # otherwise the older mq (Multiqueue) policy is selected.
         # This configuration option does not have a default value defined.
  
@@ -407,6 +440,12 @@ allocation {
         # 32KiB to 1GiB in multiples of 32.
         # This configuration option does not have a default value defined.
  
+       # Configuration option allocation/cache_pool_max_chunks.
+       # The maximum number of chunks in a cache pool.
+       # For cache target v1.9 the recommended maximumm is 1000000 chunks.
+       # Using cache pool with more chunks may degrade cache performance.
+       # This configuration option does not have a default value defined.
+
         # Configuration option allocation/thin_pool_metadata_require_separate_pvs.
         # Thin pool metdata and data will always use different PVs.
         thin_pool_metadata_require_separate_pvs = 0
@@ -465,6 +504,55 @@ allocation {
  # How LVM log information is reported.
  log {
  
+       # Configuration option log/report_command_log.
+       # Enable or disable LVM log reporting.
+       # If enabled, LVM will collect a log of operations, messages,
+       # per-object return codes with object identification and associated
+       # error numbers (errnos) during LVM command processing. Then the
+       # log is either reported solely or in addition to any existing
+       # reports, depending on LVM command used. If it is a reporting command
+       # (e.g. pvs, vgs, lvs, lvm fullreport), then the log is reported in
+       # addition to any existing reports. Otherwise, there's only log report
+       # on output. For all applicable LVM commands, you can request that
+       # the output has only log report by using --logonly command line
+       # option. Use log/command_log_cols and log/command_log_sort settings
+       # to define fields to display and sort fields for the log report.
+       # You can also use log/command_log_selection to define selection
+       # criteria used each time the log is reported.
+       # This configuration option has an automatic default value.
+       # report_command_log = 0
+
+       # Configuration option log/command_log_sort.
+       # List of columns to sort by when reporting command log.
+       # See <lvm command> --logonly --configreport log -o help
+       # for the list of possible fields.
+       # This configuration option has an automatic default value.
+       # command_log_sort = "log_seq_num"
+
+       # Configuration option log/command_log_cols.
+       # List of columns to report when reporting command log.
+       # See <lvm command> --logonly --configreport log -o help
+       # for the list of possible fields.
+       # This configuration option has an automatic default value.
+       # command_log_cols = "log_seq_num,log_type,log_context,log_object_type,log_object_name,log_object_id,log_object_group,log_object_group_id,log_message,log_errno,log_ret_code"
+
+       # Configuration option log/command_log_selection.
+       # Selection criteria used when reporting command log.
+       # You can define selection criteria that are applied each
+       # time log is reported. This way, it is possible to control the
+       # amount of log that is displayed on output and you can select
+       # only parts of the log that are important for you. To define
+       # selection criteria, use fields from log report. See also
+       # <lvm command> --logonly --configreport log -S help for the
+       # list of possible fields and selection operators. You can also
+       # define selection criteria for log report on command line directly
+       # using <lvm command> --configreport log -S <selection criteria>
+       # which has precedence over log/command_log_selection setting.
+       # For more information about selection criteria in general, see
+       # lvm(8) man page.
+       # This configuration option has an automatic default value.
+       # command_log_selection = "!(log_type=status && message=success)"
+
         # Configuration option log/verbose.
         # Controls the messages sent to stdout or stderr.
         verbose = 0
@@ -525,7 +613,7 @@ log {
         # debug output if the class is listed here. Classes currently
         # available: memory, devices, activation, allocation, lvmetad,
         # metadata, cache, locking, lvmpolld. Use "all" to see everything.
-       debug_classes = [ "memory", "devices", "activation", "allocation", "lvmetad", "metadata", "cache", "locking", "lvmpolld" ]
+       debug_classes = [ "memory", "devices", "activation", "allocation", "lvmetad", "metadata", "cache", "locking", "lvmpolld", "dbus" ]
  }
  
  # Configuration section backup.
@@ -589,7 +677,7 @@ global {
  
         # Configuration option global/units.
         # Default value for --units argument.
-       units = "h"
+       units = "r"
  
         # Configuration option global/si_unit_consistency.
         # Distinguish between powers of 1024 and 1000 bytes.
@@ -851,13 +939,23 @@ global {
         # devices/global_filter.
         use_lvmetad = 1
  
+       # Configuration option global/lvmetad_update_wait_time.
+       # Number of seconds a command will wait for lvmetad update to finish.
+       # After waiting for this period, a command will not use lvmetad, and
+       # will revert to disk scanning.
+       # This configuration option has an automatic default value.
+       # lvmetad_update_wait_time = 10
+
         # Configuration option global/use_lvmlockd.
         # Use lvmlockd for locking among hosts using LVM on shared storage.
-       # See lvmlockd(8) for more information.
+       # Applicable only if LVM is compiled with lockd support in which
+       # case there is also lvmlockd(8) man page available for more
+       # information.
         use_lvmlockd = 0
  
         # Configuration option global/lvmlockd_lock_retries.
         # Retry lvmlockd lock requests this many times.
+       # Applicable only if LVM is compiled with lockd support
         # This configuration option has an automatic default value.
         # lvmlockd_lock_retries = 3
  
@@ -867,7 +965,8 @@ global {
         # LVs have been created, the internal LV needs to be extended. lvcreate
         # will automatically extend the internal LV when needed by the amount
         # specified here. Setting this to 0 disables the automatic extension
-       # and can cause lvcreate to fail.
+       # and can cause lvcreate to fail. Applicable only if LVM is compiled
+       # with lockd support
         # This configuration option has an automatic default value.
         # sanlock_lv_extend = 256
  
@@ -926,7 +1025,7 @@ global {
         # Configuration option global/cache_disabled_features.
         # Features to not use in the cache driver.
         # This can be helpful for testing, or to avoid using a feature that is
-       # causing problems. Features include: policy_mq, policy_smq.
+       # causing problems. Features include: policy_mq, policy_smq, metadata2.
         # 
         # Example
         # cache_disabled_features = [ "policy_smq" ]
@@ -971,6 +1070,12 @@ global {
         # This configuration option has an automatic default value.
         # cache_repair_options = [ "" ]
  
+       # Configuration option global/fsadm_executable.
+       # The full path to the fsadm command.
+       # LVM uses this command to help with lvresize -r operations.
+       # This configuration option has an automatic default value.
+       # fsadm_executable = "/sbin/fsadm"
+
         # Configuration option global/system_id_source.
         # The method LVM uses to set the local system ID.
         # Volume Groups can also be given a system ID (by vgcreate, vgchange,
@@ -1014,7 +1119,14 @@ global {
         # a native systemd service, which allows it to be started on demand,
         # and to use its own control group. When this option is disabled, LVM
         # commands will supervise long running operations by forking themselves.
+       # Applicable only if LVM is compiled with lvmpolld support.
         use_lvmpolld = 1
+
+       # Configuration option global/notify_dbus.
+       # Enable D-Bus notification from LVM commands.
+       # When enabled, an LVM command that changes PVs, changes VG metadata,
+       # or changes the activation state of an LV will send a notification.
+       notify_dbus = 1
  }
  
  # Configuration section activation.
@@ -1062,7 +1174,8 @@ activation {
         # Configuration option activation/missing_stripe_filler.
         # Method to fill missing stripes when activating an incomplete LV.
         # Using 'error' will make inaccessible parts of the device return I/O
-       # errors on access. You can instead use a device path, in which case,
+       # errors on access. Using 'zero' will return success (and zero) on I/O
+       # You can instead use a device path, in which case,
         # that device will be used in place of missing stripes. Using anything
         # other than 'error' with mirrored or snapshotted volumes is likely to
         # result in data corruption.
@@ -1109,8 +1222,8 @@ activation {
         #   @*
         #     Selects an LV if a tag defined on the host is also set on the LV
         #     or VG. See tags/hosttags. If any host tags exist but volume_list
-       #     is not defined, a default single-entry list containing '@*' is
-       #     assumed.
+       #     is not defined, a default single-entry list containing '@*'
+       #     is assumed.
         # 
         # Example
         # volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
@@ -1146,11 +1259,11 @@ activation {
         #   @*
         #     Selects an LV if a tag defined on the host is also set on the LV
         #     or VG. See tags/hosttags. If any host tags exist but volume_list
-       #     is not defined, a default single-entry list containing '@*' is
-       #     assumed.
+       #     is not defined, a default single-entry list containing '@*'
+       #     is assumed.
         # 
         # Example
-       # volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
+       # auto_activation_volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
         # 
         # This configuration option does not have a default value defined.
  
@@ -1172,19 +1285,20 @@ activation {
         #   @*
         #     Selects an LV if a tag defined on the host is also set on the LV
         #     or VG. See tags/hosttags. If any host tags exist but volume_list
-       #     is not defined, a default single-entry list containing '@*' is
-       #     assumed.
+       #     is not defined, a default single-entry list containing '@*'
+       #     is assumed.
         # 
         # Example
-       # volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
+       # read_only_volume_list = [ "vg1", "vg2/lvol1", "@tag1", "@*" ]
         # 
         # This configuration option does not have a default value defined.
  
         # Configuration option activation/raid_region_size.
         # Size in KiB of each raid or mirror synchronization region.
-       # For raid or mirror segment types, this is the amount of data that is
-       # copied at once when initializing, or moved at once by pvmove.
-       raid_region_size = 512
+       # The clean/dirty state of data is tracked for each region.
+       # The value is rounded down to a power of two if necessary, and
+       # is ignored if it is not a multiple of the machine memory page size.
+       raid_region_size = 2048
  
         # Configuration option activation/error_when_full.
         # Return errors if a thin pool runs out of space.
@@ -1415,6 +1529,33 @@ activation {
  # This configuration section has an automatic default value.
  # metadata {
  
+       # Configuration option metadata/check_pv_device_sizes.
+       # Check device sizes are not smaller than corresponding PV sizes.
+       # If device size is less than corresponding PV size found in metadata,
+       # there is always a risk of data loss. If this option is set, then LVM
+       # issues a warning message each time it finds that the device size is
+       # less than corresponding PV size. You should not disable this unless
+       # you are absolutely sure about what you are doing!
+       # This configuration option is advanced.
+       # This configuration option has an automatic default value.
+       # check_pv_device_sizes = 1
+
+       # Configuration option metadata/record_lvs_history.
+       # When enabled, LVM keeps history records about removed LVs in
+       # metadata. The information that is recorded in metadata for
+       # historical LVs is reduced when compared to original
+       # information kept in metadata for live LVs. Currently, this
+       # feature is supported for thin and thin snapshot LVs only.
+       # This configuration option has an automatic default value.
+       # record_lvs_history = 0
+
+       # Configuration option metadata/lvs_history_retention_time.
+       # Retention time in seconds after which a record about individual
+       # historical logical volume is automatically destroyed.
+       # A value of 0 disables this feature.
+       # This configuration option has an automatic default value.
+       # lvs_history_retention_time = 0
+
         # Configuration option metadata/pvmetadatacopies.
         # Number of copies of metadata to store on each PV.
         # The --pvmetadatacopies option overrides this setting.
@@ -1493,6 +1634,22 @@ activation {
  # This configuration section has an automatic default value.
  # report {
  
+       # Configuration option report/output_format.
+       # Format of LVM command's report output.
+       # If there is more than one report per command, then the format
+       # is applied for all reports. You can also change output format
+       # directly on command line using --reportformat option which
+       # has precedence over log/output_format setting.
+       # Accepted values:
+       #   basic
+       #     Original format with columns and rows. If there is more than
+       #     one report per command, each report is prefixed with report's
+       #     name for identification.
+       #   json
+       #     JSON format.
+       # This configuration option has an automatic default value.
+       # output_format = "basic"
+
         # Configuration option report/compact_output.
         # Do not print empty values for all report fields.
         # If enabled, all fields that don't have a value set for any of the
@@ -1553,11 +1710,11 @@ activation {
         # This configuration option has an automatic default value.
         # quoted = 1
  
-       # Configuration option report/colums_as_rows.
+       # Configuration option report/columns_as_rows.
         # Output each column as a row.
         # If set, this also implies report/prefixes=1.
         # This configuration option has an automatic default value.
-       # colums_as_rows = 0
+       # columns_as_rows = 0
  
         # Configuration option report/binary_values_as_numeric.
         # Use binary values 0 or 1 instead of descriptive literal values.
@@ -1808,6 +1965,77 @@ activation {
         # See 'pvs --segments -o help' for the list of possible fields.
         # This configuration option has an automatic default value.
         # pvsegs_cols_verbose = "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size,lv_name,seg_start_pe,segtype,seg_pe_ranges"
+
+       # Configuration option report/vgs_cols_full.
+       # List of columns to report for lvm fullreport's 'vgs' subreport.
+       # See 'vgs -o help' for the list of possible fields.
+       # This configuration option has an automatic default value.
+       # vgs_cols_full = "vg_all"
+
+       # Configuration option report/pvs_cols_full.
+       # List of columns to report for lvm fullreport's 'vgs' subreport.
+       # See 'pvs -o help' for the list of possible fields.
+       # This configuration option has an automatic default value.
+       # pvs_cols_full = "pv_all"
+
+       # Configuration option report/lvs_cols_full.
+       # List of columns to report for lvm fullreport's 'lvs' subreport.
+       # See 'lvs -o help' for the list of possible fields.
+       # This configuration option has an automatic default value.
+       # lvs_cols_full = "lv_all"
+
+       # Configuration option report/pvsegs_cols_full.
+       # List of columns to report for lvm fullreport's 'pvseg' subreport.
+       # See 'pvs --segments -o help' for the list of possible fields.
+       # This configuration option has an automatic default value.
+       # pvsegs_cols_full = "pvseg_all,pv_uuid,lv_uuid"
+
+       # Configuration option report/segs_cols_full.
+       # List of columns to report for lvm fullreport's 'seg' subreport.
+       # See 'lvs --segments -o help' for the list of possible fields.
+       # This configuration option has an automatic default value.
+       # segs_cols_full = "seg_all,lv_uuid"
+
+       # Configuration option report/vgs_sort_full.
+       # List of columns to sort by when reporting lvm fullreport's 'vgs' subreport.
+       # See 'vgs -o help' for the list of possible fields.
+       # This configuration option has an automatic default value.
+       # vgs_sort_full = "vg_name"
+
+       # Configuration option report/pvs_sort_full.
+       # List of columns to sort by when reporting lvm fullreport's 'vgs' subreport.
+       # See 'pvs -o help' for the list of possible fields.
+       # This configuration option has an automatic default value.
+       # pvs_sort_full = "pv_name"
+
+       # Configuration option report/lvs_sort_full.
+       # List of columns to sort by when reporting lvm fullreport's 'lvs' subreport.
+       # See 'lvs -o help' for the list of possible fields.
+       # This configuration option has an automatic default value.
+       # lvs_sort_full = "vg_name,lv_name"
+
+       # Configuration option report/pvsegs_sort_full.
+       # List of columns to sort by when reporting for lvm fullreport's 'pvseg' subreport.
+       # See 'pvs --segments -o help' for the list of possible fields.
+       # This configuration option has an automatic default value.
+       # pvsegs_sort_full = "pv_uuid,pvseg_start"
+
+       # Configuration option report/segs_sort_full.
+       # List of columns to sort by when reporting lvm fullreport's 'seg' subreport.
+       # See 'lvs --segments -o help' for the list of possible fields.
+       # This configuration option has an automatic default value.
+       # segs_sort_full = "lv_uuid,seg_start"
+
+       # Configuration option report/mark_hidden_devices.
+       # Use brackets [] to mark hidden devices.
+       # This configuration option has an automatic default value.
+       # mark_hidden_devices = 1
+
+       # Configuration option report/two_word_unknown_device.
+       # Use the two words 'unknown device' in place of '[unknown]'.
+       # This is displayed when the device for a PV is not known.
+       # This configuration option has an automatic default value.
+       # two_word_unknown_device = 0
  # }
  
  # Configuration section dmeventd.
@@ -1840,6 +2068,15 @@ dmeventd {
         # warning is repeated when 85%, 90% and 95% of the pool is filled.
         thin_library = "libdevmapper-event-lvm2thin.so"
  
+       # Configuration option dmeventd/thin_command.
+       # The plugin runs command with each 5% increment when thin-pool data volume
+       # or metadata volume gets above 50%.
+       # Command which starts with 'lvm ' prefix is internal lvm command.
+       # You can write your own handler to customise behaviour in more details.
+       # User handler is specified with the full path starting with '/'.
+       # This configuration option has an automatic default value.
+       # thin_command = "lvm lvextend --use-policies"
+
         # Configuration option dmeventd/executable.
         # The full path to the dmeventd binary.
         # This configuration option has an automatic default value.
diff --git a/lvm/lvmlocal.conf b/lvm/lvmlocal.conf

new file mode 100644 (file)

index 0000000..2fe6446
--- /dev/null
+++ b/lvm/lvmlocal.conf
@@ -0,0 +1,57 @@
+# This is a local configuration file template for the LVM2 system
+# which should be installed as /etc/lvm/lvmlocal.conf .
+#
+# Refer to 'man lvm.conf' for information about the file layout.
+#
+# To put this file in a different directory and override
+# /etc/lvm set the environment variable LVM_SYSTEM_DIR before
+# running the tools.
+#
+# The lvmlocal.conf file is normally expected to contain only the
+# "local" section which contains settings that should not be shared or
+# repeated among different hosts.  (But if other sections are present,
+# they *will* get processed.  Settings in this file override equivalent
+# ones in lvm.conf and are in turn overridden by ones in any enabled
+# lvm_<tag>.conf files.)
+#
+# Please take care that each setting only appears once if uncommenting
+# example settings in this file and never copy this file between hosts.
+
+
+# Configuration section local.
+# LVM settings that are specific to the local host.
+local {
+
+       # Configuration option local/system_id.
+       # Defines the local system ID for lvmlocal mode.
+       # This is used when global/system_id_source is set to 'lvmlocal' in the
+       # main configuration file, e.g. lvm.conf. When used, it must be set to
+       # a unique value among all hosts sharing access to the storage,
+       # e.g. a host name.
+       # 
+       # Example
+       # Set no system ID:
+       # system_id = ""
+       # Set the system_id to a specific name:
+       # system_id = "host1"
+       # 
+       # This configuration option has an automatic default value.
+       # system_id = ""
+
+       # Configuration option local/extra_system_ids.
+       # A list of extra VG system IDs the local host can access.
+       # VGs with the system IDs listed here (in addition to the host's own
+       # system ID) can be fully accessed by the local host. (These are
+       # system IDs that the host sees in VGs, not system IDs that identify
+       # the local host, which is determined by system_id_source.)
+       # Use this only after consulting 'man lvmsystemid' to be certain of
+       # correct usage and possible dangers.
+       # This configuration option does not have a default value defined.
+
+       # Configuration option local/host_id.
+       # The lvmlockd sanlock host_id.
+       # This must be unique among all hosts, and must be between 1 and 2000.
+       # Applicable only if LVM is compiled with lockd support
+       # This configuration option has an automatic default value.
+       # host_id = 0
+}
diff --git a/lvm/profile/cache-mq.profile b/lvm/profile/cache-mq.profile

new file mode 100644 (file)

index 0000000..3c90331
--- /dev/null
+++ b/lvm/profile/cache-mq.profile
@@ -0,0 +1,20 @@
+# Demo configuration 'mq' cache policy
+#
+# Note: This policy has been deprecated in favor of the smq policy
+# keyword "default" means, setting is left with kernel defaults.
+#
+
+allocation {
+       cache_pool_chunk_size = 64
+       cache_mode = "writethrough"
+       cache_policy = "mq"
+       cache_settings {
+               mq {
+                       sequential_threshold = "default"        #  #nr_sequential_ios
+                       random_threshold = "default"            #  #nr_random_ios
+                       read_promote_adjustment = "default"
+                       write_promote_adjustment = "default"
+                       discard_promote_adjustment = "default"
+               }
+       }
+}
diff --git a/lvm/profile/cache-smq.profile b/lvm/profile/cache-smq.profile

new file mode 100644 (file)

index 0000000..c457481
--- /dev/null
+++ b/lvm/profile/cache-smq.profile
@@ -0,0 +1,14 @@
+# Demo configuration 'smq' cache policy
+#
+# The stochastic multi-queue (smq) policy addresses some of the problems
+# with the multiqueue (mq) policy and uses less memory.
+#
+
+allocation {
+       cache_pool_chunk_size = 64
+       cache_mode = "writethrough"
+       cache_policy = "smq"
+       cache_settings {
+               # currently no settings for "smq" policy
+       }
+}
diff --git a/lvm/profile/command_profile_template.profile b/lvm/profile/command_profile_template.profile

new file mode 100644 (file)

index 0000000..bf56799
--- /dev/null
+++ b/lvm/profile/command_profile_template.profile
@@ -0,0 +1,74 @@
+# This is a command profile template for the LVM2 system.
+#
+# It contains all configuration settings that are customizable by command
+# profiles. To create a new command profile, select the settings you want
+# to customize and add them in a new file named <profile_name>.profile.
+# Then install the new profile in a directory as defined by config/profile_dir
+# setting found in /etc/lvm/lvm.conf file.
+#
+# Command profiles can be referenced by using the --commandprofile option then.
+#
+# Refer to 'man lvm.conf' for further information about profiles and
+# general configuration file layout.
+#
+allocation {
+       cache_mode="writethrough"
+       cache_settings {
+       }
+}
+log {
+       report_command_log=0
+       command_log_sort="log_seq_num"
+       command_log_cols="log_seq_num,log_type,log_context,log_object_type,log_object_name,log_object_id,log_object_group,log_object_group_id,log_message,log_errno,log_ret_code"
+       command_log_selection="!(log_type=status && message=success)"
+}
+global {
+       units="h"
+       si_unit_consistency=1
+       suffix=1
+       lvdisplay_shows_full_device_path=0
+}
+report {
+       output_format="basic"
+       compact_output=0
+       compact_output_cols=""
+       aligned=1
+       buffered=1
+       headings=1
+       separator=" "
+       list_item_separator=","
+       prefixes=0
+       quoted=1
+       columns_as_rows=0
+       binary_values_as_numeric=0
+       time_format="%Y-%m-%d %T %z"
+       devtypes_sort="devtype_name"
+       devtypes_cols="devtype_name,devtype_max_partitions,devtype_description"
+       devtypes_cols_verbose="devtype_name,devtype_max_partitions,devtype_description"
+       lvs_sort="vg_name,lv_name"
+       lvs_cols="lv_name,vg_name,lv_attr,lv_size,pool_lv,origin,data_percent,metadata_percent,move_pv,mirror_log,copy_percent,convert_lv"
+       lvs_cols_verbose="lv_name,vg_name,seg_count,lv_attr,lv_size,lv_major,lv_minor,lv_kernel_major,lv_kernel_minor,pool_lv,origin,data_percent,metadata_percent,move_pv,copy_percent,mirror_log,convert_lv,lv_uuid,lv_profile"
+       vgs_sort="vg_name"
+       vgs_cols="vg_name,pv_count,lv_count,snap_count,vg_attr,vg_size,vg_free"
+       vgs_cols_verbose="vg_name,vg_attr,vg_extent_size,pv_count,lv_count,snap_count,vg_size,vg_free,vg_uuid,vg_profile"
+       pvs_sort="pv_name"
+       pvs_cols="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free"
+       pvs_cols_verbose="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,dev_size,pv_uuid"
+       segs_sort="vg_name,lv_name,seg_start"
+       segs_cols="lv_name,vg_name,lv_attr,stripes,segtype,seg_size"
+       segs_cols_verbose="lv_name,vg_name,lv_attr,seg_start,seg_size,stripes,segtype,stripesize,chunksize"
+       pvsegs_sort="pv_name,pvseg_start"
+       pvsegs_cols="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size"
+       pvsegs_cols_verbose="pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size,lv_name,seg_start_pe,segtype,seg_pe_ranges"
+       vgs_cols_full="vg_all"
+       pvs_cols_full="pv_all"
+       lvs_cols_full="lv_all"
+       pvsegs_cols_full="pvseg_all,pv_uuid,lv_uuid"
+       segs_cols_full="seg_all,lv_uuid"
+       vgs_sort_full="vg_name"
+       pvs_sort_full="pv_name"
+       lvs_sort_full="vg_name,lv_name"
+       pvsegs_sort_full="pv_uuid,pvseg_start"
+       segs_sort_full="lv_uuid,seg_start"
+       mark_hidden_devices=1
+}
diff --git a/lvm/profile/lvmdbusd.profile b/lvm/profile/lvmdbusd.profile

new file mode 100644 (file)

index 0000000..2cdc6da
--- /dev/null
+++ b/lvm/profile/lvmdbusd.profile
@@ -0,0 +1,50 @@
+#
+# DO NOT EDIT THIS FILE!
+#
+# LVM configuration profile used by lvmdbusd daemon.
+#
+# This sets up LVM to produce output in the most suitable format for processing
+# by lvmdbusd daemon which utilizes LVM shell to execute LVM commands.
+#
+# Do not edit this file in any way. This profile is distributed together with
+# lvmdbusd and it contains configuration that is important for lvmdbusd to
+# cooperate and interface with LVM correctly.
+#
+
+global {
+       # use bytes for expected and deterministic output
+       units=b
+       # no need for suffix if we have units set
+       suffix=0
+}
+
+report {
+       compact_output=0
+       compact_output_cols=""
+       binary_values_as_numeric=0
+       # time in number of seconds since the Epoch
+       time_format="%s"
+       mark_hidden_devices=1
+       # lvmdbusd expects JSON output
+       output_format=json
+       # *_cols_full for lvm fullreport's fields which lvmdbusd relies on to update its state
+       vgs_cols_full="vg_name,vg_uuid,vg_fmt,vg_size,vg_free,vg_sysid,vg_extent_size,vg_extent_count,vg_free_count,vg_profile,max_lv,max_pv,pv_count,lv_count,snap_count,vg_seqno,vg_mda_count,vg_mda_free,vg_mda_size,vg_mda_used_count,vg_attr,vg_tags"
+       pvs_cols_full="pv_name,pv_uuid,pv_fmt,pv_size,pv_free,pv_used,dev_size,pv_mda_size,pv_mda_free,pv_ba_start,pv_ba_size,pe_start,pv_pe_count,pv_pe_alloc_count,pv_attr,pv_tags,vg_name,vg_uuid"
+       lvs_cols_full="lv_uuid,lv_name,lv_path,lv_size,vg_name,pool_lv_uuid,pool_lv,origin_uuid,origin,data_percent,lv_attr,lv_tags,vg_uuid,lv_active,data_lv,metadata_lv,lv_parent,lv_role,lv_layout"
+       pvsegs_cols_full="pvseg_start,pvseg_size,segtype,pv_uuid,lv_uuid,pv_name"
+       segs_cols_full="seg_pe_ranges,segtype,lv_uuid"
+       vgs_sort_full="vg_name"
+       pvs_sort_full="pv_name"
+       lvs_sort_full="vg_name,lv_name"
+       pvsegs_sort_full="pv_uuid,pvseg_start"
+       segs_sort_full="lv_uuid,seg_start"
+}
+
+log {
+       # lvmdbusd relies on command log report to inspect LVM command's execution status
+       report_command_log=1
+       # display only outermost LVM shell-related log that lvmdbusd inspects first after LVM command execution (it calls 'lastlog' for more detailed log afterwards if needed)
+       command_log_selection="log_context=shell"
+       command_log_cols="log_seq_num,log_type,log_context,log_object_type,log_object_name,log_object_id,log_object_group,log_object_group_id,log_message,log_errno,log_ret_code"
+       command_log_sort="log_seq_num"
+}
diff --git a/lvm/profile/metadata_profile_template.profile b/lvm/profile/metadata_profile_template.profile

new file mode 100644 (file)

index 0000000..5836a63
--- /dev/null
+++ b/lvm/profile/metadata_profile_template.profile
@@ -0,0 +1,24 @@
+# This is a metadata profile template for the LVM2 system.
+#
+# It contains all configuration settings that are customizable by metadata
+# profiles. To create a new metadata profile, select the settings you want
+# to customize and add them in a new file named <profile_name>.profile.
+# Then install the new profile in a directory as defined by config/profile_dir
+# setting found in /etc/lvm/lvm.conf file.
+#
+# Metadata profiles can be referenced by using the --metadataprofile LVM2
+# command line option.
+#
+# Refer to 'man lvm.conf' for further information about profiles and
+# general configuration file layout.
+#
+allocation {
+       thin_pool_zero=1
+       thin_pool_discards="passdown"
+       thin_pool_chunk_size_policy="generic"
+#      thin_pool_chunk_size=128
+}
+activation {
+       thin_pool_autoextend_threshold=100
+       thin_pool_autoextend_percent=20
+}
diff --git a/lvm/profile/thin-generic.profile b/lvm/profile/thin-generic.profile

new file mode 100644 (file)

index 0000000..229a7fc
--- /dev/null
+++ b/lvm/profile/thin-generic.profile
@@ -0,0 +1,4 @@
+allocation {
+       thin_pool_chunk_size_policy = "generic"
+       thin_pool_zero = 1
+}
diff --git a/lvm/profile/thin-performance.profile b/lvm/profile/thin-performance.profile

new file mode 100644 (file)

index 0000000..2914de2
--- /dev/null
+++ b/lvm/profile/thin-performance.profile
@@ -0,0 +1,4 @@
+allocation {
+       thin_pool_chunk_size_policy = "performance"
+       thin_pool_zero = 0
+}
diff --git a/mailcap b/mailcap

index cd5fbbde6ef90c5beb87939f19566620e8ef0668..f6397f5751a23050b0a6c80c8d1bb9db7beaf89a 100644 (file)
--- a/mailcap
+++ b/mailcap
@@ -134,6 +134,7 @@ audio/basic; /usr/bin/play -t au %s
  audio/x-aiff; /usr/bin/play -t aiff %s
  audio/x-gsm; /usr/bin/play -t gsm %s
  audio/x-wav; /usr/bin/play -t wav %s
+application/sweethome3d; /usr/bin/sweethome3d -- '%s'; edit=/usr/bin/sweethome3d -- '%s'; description="Sweet Home 3D"; test=test -n "$DISPLAY"
  application/x-bittorrent; transmission-gtk %s; description="GTK-based BitTorrent client"; test=test -n "$DISPLAY"
  text/plain; more %s; needsterminal
  application/pdf; acroread  %s; test=test -n "$DISPLAY"
@@ -433,8 +434,6 @@ application/x-bzip-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
  application/x-bzip1; file-roller %s; test=test -n "$DISPLAY"
  application/x-bzip1-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
  application/x-cabinet; file-roller %s; test=test -n "$DISPLAY"
-application/x-cbr; file-roller %s; test=test -n "$DISPLAY"
-application/x-cbz; file-roller %s; test=test -n "$DISPLAY"
  application/x-cd-image; file-roller %s; test=test -n "$DISPLAY"
  application/x-compress; file-roller %s; test=test -n "$DISPLAY"
  application/x-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
@@ -450,16 +449,19 @@ application/x-lha; file-roller %s; test=test -n "$DISPLAY"
  application/x-lhz; file-roller %s; test=test -n "$DISPLAY"
  application/x-lrzip; file-roller %s; test=test -n "$DISPLAY"
  application/x-lrzip-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
+application/x-lz4; file-roller %s; test=test -n "$DISPLAY"
  application/x-lzip; file-roller %s; test=test -n "$DISPLAY"
  application/x-lzip-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
  application/x-lzma; file-roller %s; test=test -n "$DISPLAY"
  application/x-lzma-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
  application/x-lzop; file-roller %s; test=test -n "$DISPLAY"
+application/x-lz4-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
  application/x-lzop-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
  application/x-ms-wim; file-roller %s; test=test -n "$DISPLAY"
  application/x-rar; file-roller %s; test=test -n "$DISPLAY"
  application/x-rar-compressed; file-roller %s; test=test -n "$DISPLAY"
  application/x-rpm; file-roller %s; test=test -n "$DISPLAY"
+application/x-source-rpm; file-roller %s; test=test -n "$DISPLAY"
  application/x-rzip; file-roller %s; test=test -n "$DISPLAY"
  application/x-rzip-compressed-tar; file-roller %s; test=test -n "$DISPLAY"
  application/x-tar; file-roller %s; test=test -n "$DISPLAY"
@@ -474,8 +476,8 @@ application/x-zoo; file-roller %s; test=test -n "$DISPLAY"
  application/zip; file-roller %s; test=test -n "$DISPLAY"
  application/x-archive; file-roller %s; test=test -n "$DISPLAY"
  application/vnd.ms-cab-compressed; file-roller %s; test=test -n "$DISPLAY"
-application/vnd.squashfs; file-roller %s; test=test -n "$DISPLAY"
-application/vnd.snap; file-roller %s; test=test -n "$DISPLAY"
+application/vnd.debian.binary-package; file-roller %s; test=test -n "$DISPLAY"
+application/gzip; file-roller %s; test=test -n "$DISPLAY"
  application/x-font-ttf; gnome-font-viewer %s; test=test -n "$DISPLAY"
  application/x-font-pcf; gnome-font-viewer %s; test=test -n "$DISPLAY"
  application/x-font-type1; gnome-font-viewer %s; test=test -n "$DISPLAY"
diff --git a/matplotlibrc b/matplotlibrc

index 7bdc68b9ec7a1db0c6069d73dde96096a2df2a06..1cb93f264e2edc5a24185567f4534e4d1805a957 100644 (file)
--- a/matplotlibrc
+++ b/matplotlibrc
@@ -23,18 +23,21 @@
  #
  # Colors: for the color values below, you can either use - a
  # matplotlib color string, such as r, k, or b - an rgb tuple, such as
-# (1.0, 0.5, 0.0) - a hex string, such as ff00ff or #ff00ff - a scalar
+# (1.0, 0.5, 0.0) - a hex string, such as ff00ff - a scalar
  # grayscale intensity such as 0.75 - a legal html color name, e.g., red,
  # blue, darkslategray
  
  #### CONFIGURATION BEGINS HERE
  
  # The default backend; one of GTK GTKAgg GTKCairo GTK3Agg GTK3Cairo
-# CocoaAgg MacOSX Qt4Agg Qt5Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG
+# MacOSX Qt4Agg Qt5Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG
  # Template.
  # You can also deploy your own backend outside of matplotlib by
  # referring to the module name (which must be in the PYTHONPATH) as
  # 'module://my_backend'.
+#
+# If you omit this parameter, it will always default to "Agg", which is a
+# non-interactive backend.
  backend      : TkAgg
  
  # If you are using the Qt4Agg backend, you can choose here
@@ -59,7 +62,7 @@ backend      : TkAgg
  
  # When True, the figures rendered in the nbagg backend are created with
  # a transparent background.
-# nbagg.transparent : True
+# nbagg.transparent : False
  
  # if you are running pyplot inside a GUI and your backend choice
  # conflicts, we will automatically try to find a compatible one for
@@ -78,11 +81,11 @@ backend      : TkAgg
  ### LINES
  # See http://matplotlib.org/api/artist_api.html#module-matplotlib.lines for more
  # information on line properties.
-#lines.linewidth   : 1.0     # line width in points
+#lines.linewidth   : 1.5     # line width in points
  #lines.linestyle   : -       # solid line
-#lines.color       : blue    # has no affect on plot(); see axes.prop_cycle
+#lines.color       : C0      # has no affect on plot(); see axes.prop_cycle
  #lines.marker      : None    # the default marker
-#lines.markeredgewidth  : 0.5     # the line width around the marker symbol
+#lines.markeredgewidth  : 1.0     # the line width around the marker symbol
  #lines.markersize  : 6            # markersize, in points
  #lines.dash_joinstyle : miter        # miter|round|bevel
  #lines.dash_capstyle : butt          # butt|round|projecting
@@ -90,6 +93,12 @@ backend      : TkAgg
  #lines.solid_capstyle : projecting   # butt|round|projecting
  #lines.antialiased : True         # render lines in antialiased (no jaggies)
  
+# The three standard dash patterns.  These are scaled by the linewidth.
+#lines.dashed_pattern : 2.8, 1.2
+#lines.dashdot_pattern : 4.8, 1.2, 0.8, 1.2
+#lines.dotted_pattern : 1.1, 1.1
+#lines.scale_dashes : True
+
  #markers.fillstyle: full # full|left|right|bottom|top|none
  
  ### PATCHES
@@ -97,11 +106,60 @@ backend      : TkAgg
  # circles.  See
  # http://matplotlib.org/api/artist_api.html#module-matplotlib.patches
  # information on patch properties
-#patch.linewidth        : 1.0     # edge width in points
-#patch.facecolor        : blue
-#patch.edgecolor        : black
+#patch.linewidth        : 1        # edge width in points.
+#patch.facecolor        : C0
+#patch.edgecolor        : black   # if forced, or patch is not filled
+#patch.force_edgecolor  : False   # True to always use edgecolor
  #patch.antialiased      : True    # render patches in antialiased (no jaggies)
  
+### HATCHES
+#hatch.color     : k
+#hatch.linewidth : 1.0
+
+### Boxplot
+#boxplot.notch       : False
+#boxplot.vertical    : True
+#boxplot.whiskers    : 1.5
+#boxplot.bootstrap   : None
+#boxplot.patchartist : False
+#boxplot.showmeans   : False
+#boxplot.showcaps    : True
+#boxplot.showbox     : True
+#boxplot.showfliers  : True
+#boxplot.meanline    : False
+
+#boxplot.flierprops.color           : 'k'
+#boxplot.flierprops.marker          : 'o'
+#boxplot.flierprops.markerfacecolor : 'none'
+#boxplot.flierprops.markeredgecolor : 'k'
+#boxplot.flierprops.markersize      : 6
+#boxplot.flierprops.linestyle       : 'none'
+#boxplot.flierprops.linewidth       : 1.0
+
+#boxplot.boxprops.color     : 'k'
+#boxplot.boxprops.linewidth : 1.0
+#boxplot.boxprops.linestyle : '-'
+
+#boxplot.whiskerprops.color     : 'k'
+#boxplot.whiskerprops.linewidth : 1.0
+#boxplot.whiskerprops.linestyle : '-'
+
+#boxplot.capprops.color     : 'k'
+#boxplot.capprops.linewidth : 1.0
+#boxplot.capprops.linestyle : '-'
+
+#boxplot.medianprops.color     : 'C1'
+#boxplot.medianprops.linewidth : 1.0
+#boxplot.medianprops.linestyle : '-'
+
+#boxplot.meanprops.color           : 'C2'
+#boxplot.meanprops.marker          : '^'
+#boxplot.meanprops.markerfacecolor : 'C2'
+#boxplot.meanprops.markeredgecolor : 'C2'
+#boxplot.meanprops.markersize      :  6
+#boxplot.meanprops.linestyle       : 'none'
+#boxplot.meanprops.linewidth       : 1.0
+
  ### FONT
  #
  # font properties used by text.Text.  See
@@ -122,7 +180,7 @@ backend      : TkAgg
  #
  # The font.variant property has two values: normal or small-caps.  For
  # TrueType fonts, which are scalable fonts, small-caps is equivalent
-# to using a font size of 'smaller', or about 83% of the current font
+# to using a font size of 'smaller', or about 83%% of the current font
  # size.
  #
  # The font.weight property has effectively 13 values: normal, bold,
@@ -136,7 +194,7 @@ backend      : TkAgg
  # property is not currently implemented.
  #
  # The font.size property is the default font size for text, given in pts.
-# 12pt is the standard value.
+# 10 pt is the standard value.
  #
  #font.family         : sans-serif
  #font.style          : normal
@@ -148,12 +206,12 @@ backend      : TkAgg
  # settings for axes and ticks. Special text sizes can be defined
  # relative to font.size, using the following values: xx-small, x-small,
  # small, medium, large, x-large, xx-large, larger, or smaller
-#font.size           : 12.0
-#font.serif          : Bitstream Vera Serif, New Century Schoolbook, Century Schoolbook L, Utopia, ITC Bookman, Bookman, Nimbus Roman No9 L, Times New Roman, Times, Palatino, Charter, serif
-#font.sans-serif     : Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Arial, Helvetica, Avant Garde, sans-serif
+#font.size           : 10.0
+#font.serif          : DejaVu Serif, Bitstream Vera Serif, New Century Schoolbook, Century Schoolbook L, Utopia, ITC Bookman, Bookman, Nimbus Roman No9 L, Times New Roman, Times, Palatino, Charter, serif
+#font.sans-serif     : DejaVu Sans, Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Arial, Helvetica, Avant Garde, sans-serif
  #font.cursive        : Apple Chancery, Textile, Zapf Chancery, Sand, Script MT, Felipa, cursive
-#font.fantasy        : Comic Sans MS, Chicago, Charcoal, Impact, Western, Humor Sans, fantasy
-#font.monospace      : Bitstream Vera Sans Mono, Andale Mono, Nimbus Mono L, Courier New, Courier, Fixed, Terminal, monospace
+#font.fantasy        : Comic Sans MS, Chicago, Charcoal, Impact, Western, Humor Sans, xkcd, fantasy
+#font.monospace      : DejaVu Sans Mono, Bitstream Vera Sans Mono, Andale Mono, Nimbus Mono L, Courier New, Courier, Fixed, Terminal, monospace
  
  ### TEXT
  # text properties used by text.Text.  See
@@ -185,20 +243,12 @@ backend      : TkAgg
                              # beware of package collisions: color, geometry, graphicx,
                              # type1cm, textcomp. Adobe Postscript (PSSNFS) font packages
                              # may also be loaded, depending on your font settings
-
-#text.dvipnghack : None      # some versions of dvipng don't handle alpha
-                             # channel properly.  Use True to correct
-                             # and flush ~/.matplotlib/tex.cache
-                             # before testing and False to force
-                             # correction off.  None will try and
-                             # guess based on your dvipng version
-
  #text.hinting : auto   # May be one of the following:
                         #   'none': Perform no hinting
-                       #   'auto': Use freetype's autohinter
+                       #   'auto': Use FreeType's autohinter
                         #   'native': Use the hinting information in the
                         #             font file, if available, and if your
-                       #             freetype library supports it
+                       #             FreeType library supports it
                         #   'either': Use the native hinting information,
                         #             or the autohinter if none is available.
                         # For backward compatibility, this value may also be
@@ -221,8 +271,9 @@ backend      : TkAgg
  #mathtext.it  : serif:italic
  #mathtext.bf  : serif:bold
  #mathtext.sf  : sans
-#mathtext.fontset : cm # Should be 'cm' (Computer Modern), 'stix',
-                       # 'stixsans' or 'custom'
+#mathtext.fontset : dejavusans # Should be 'dejavusans' (default),
+                               # 'dejavuserif', 'cm' (Computer Modern), 'stix',
+                               # 'stixsans' or 'custom'
  #mathtext.fallback_to_cm : True  # When True, use symbols from the Computer Modern
                                   # fonts when a symbol can not be found in one of
                                   # the custom math fonts.
@@ -236,18 +287,19 @@ backend      : TkAgg
  # default face and edge color, default tick sizes,
  # default fontsizes for ticklabels, and so on.  See
  # http://matplotlib.org/api/axes_api.html#module-matplotlib.axes
-#axes.hold           : True    # whether to clear the axes by default on
  #axes.facecolor      : white   # axes background color
  #axes.edgecolor      : black   # axes edge color
-#axes.linewidth      : 1.0     # edge linewidth
+#axes.linewidth      : 0.8     # edge linewidth
  #axes.grid           : False   # display grid or not
  #axes.titlesize      : large   # fontsize of the axes title
+#axes.titlepad       : 6.0     # pad between axes and title in points
  #axes.labelsize      : medium  # fontsize of the x any y labels
-#axes.labelpad       : 5.0     # space between label and axis
+#axes.labelpad       : 4.0     # space between label and axis
  #axes.labelweight    : normal  # weight of the x and y labels
  #axes.labelcolor     : black
-#axes.axisbelow      : False   # whether axis gridlines and ticks are below
-                               # the axes elements (lines, text, etc)
+#axes.axisbelow      : 'line'  # draw axis gridlines and ticks below
+                               # patches (True); above patches but below
+                               # lines ('line'); or above all (False)
  
  #axes.formatter.limits : -7, 7 # use scientific notation if log10
                                 # of the axis range is smaller than the
@@ -258,82 +310,127 @@ backend      : TkAgg
                                     # separator in the fr_FR locale.
  #axes.formatter.use_mathtext : False # When True, use mathtext for scientific
                                       # notation.
+#axes.formatter.min_exponent: 0 # minimum exponent to format in scientific notation
  #axes.formatter.useoffset      : True    # If True, the tick label formatter
                                           # will default to labeling ticks relative
-                                         # to an offset when the data range is very
+                                         # to an offset when the data range is
                                           # small compared to the minimum absolute
                                           # value of the data.
+#axes.formatter.offset_threshold : 4     # When useoffset is True, the offset
+                                         # will be used when it can remove
+                                         # at least this number of significant
+                                         # digits from tick labels.
+
+# axes.spines.left   : True   # display axis spines
+# axes.spines.bottom : True
+# axes.spines.top    : True
+# axes.spines.right  : True
+
  
  #axes.unicode_minus  : True    # use unicode for the minus symbol
                                 # rather than hyphen.  See
                                 # http://en.wikipedia.org/wiki/Plus_and_minus_signs#Character_codes
-#axes.prop_cycle    : cycler('color', 'bgrcmyk')
-                                            # color cycle for plot lines
-                                            # as list of string colorspecs:
-                                            # single letter, long name, or
-                                            # web-style hex
-#axes.xmargin        : 0  # x margin.  See `axes.Axes.margins`
-#axes.ymargin        : 0  # y margin See `axes.Axes.margins`
+# axes.prop_cycle    : cycler('color', ['1f77b4', 'ff7f0e', '2ca02c', 'd62728', '9467bd', '8c564b', 'e377c2', '7f7f7f', 'bcbd22', '17becf'])
+                      # color cycle for plot lines  as list of string
+                      # colorspecs: single letter, long name, or web-style hex
+#axes.autolimit_mode : data # How to scale axes limits to the data.
+                            # Use "data" to use data limits, plus some margin
+                            # Use "round_number" move to the nearest "round" number
+#axes.xmargin        : .05  # x margin.  See `axes.Axes.margins`
+#axes.ymargin        : .05  # y margin See `axes.Axes.margins`
  
  #polaraxes.grid      : True    # display grid on polar axes
  #axes3d.grid         : True    # display grid on 3d axes
  
+### DATES
+# These control the default format strings used in AutoDateFormatter.
+# Any valid format datetime format string can be used (see the python
+# `datetime` for details).  For example using '%%x' will use the locale date representation
+# '%%X' will use the locale time representation and '%%c' will use the full locale datetime
+# representation.
+# These values map to the scales:
+#    {'year': 365, 'month': 30, 'day': 1, 'hour': 1/24, 'minute': 1 / (24 * 60)}
+
+# date.autoformatter.year     : %Y
+# date.autoformatter.month    : %Y-%m
+# date.autoformatter.day      : %Y-%m-%d
+# date.autoformatter.hour     : %m-%d %H
+# date.autoformatter.minute   : %d %H:%M
+# date.autoformatter.second   : %H:%M:%S
+# date.autoformatter.microsecond   : %M:%S.%f
+
  ### TICKS
  # see http://matplotlib.org/api/axis_api.html#matplotlib.axis.Tick
-#xtick.major.size     : 4      # major tick size in points
+#xtick.top            : False   # draw ticks on the top side
+#xtick.bottom         : True   # draw ticks on the bottom side
+#xtick.major.size     : 3.5      # major tick size in points
  #xtick.minor.size     : 2      # minor tick size in points
-#xtick.major.width    : 0.5    # major tick width in points
-#xtick.minor.width    : 0.5    # minor tick width in points
-#xtick.major.pad      : 4      # distance to major tick label in points
-#xtick.minor.pad      : 4      # distance to the minor tick label in points
+#xtick.major.width    : 0.8    # major tick width in points
+#xtick.minor.width    : 0.6    # minor tick width in points
+#xtick.major.pad      : 3.5      # distance to major tick label in points
+#xtick.minor.pad      : 3.4      # distance to the minor tick label in points
  #xtick.color          : k      # color of the tick labels
  #xtick.labelsize      : medium # fontsize of the tick labels
-#xtick.direction      : in     # direction: in, out, or inout
-
-#ytick.major.size     : 4      # major tick size in points
+#xtick.direction      : out    # direction: in, out, or inout
+#xtick.minor.visible  : False  # visibility of minor ticks on x-axis
+#xtick.major.top      : True   # draw x axis top major ticks
+#xtick.major.bottom   : True   # draw x axis bottom major ticks
+#xtick.minor.top      : True   # draw x axis top minor ticks
+#xtick.minor.bottom   : True   # draw x axis bottom minor ticks
+
+#ytick.left           : True   # draw ticks on the left side
+#ytick.right          : False  # draw ticks on the right side
+#ytick.major.size     : 3.5      # major tick size in points
  #ytick.minor.size     : 2      # minor tick size in points
-#ytick.major.width    : 0.5    # major tick width in points
-#ytick.minor.width    : 0.5    # minor tick width in points
-#ytick.major.pad      : 4      # distance to major tick label in points
-#ytick.minor.pad      : 4      # distance to the minor tick label in points
+#ytick.major.width    : 0.8    # major tick width in points
+#ytick.minor.width    : 0.6    # minor tick width in points
+#ytick.major.pad      : 3.5      # distance to major tick label in points
+#ytick.minor.pad      : 3.4      # distance to the minor tick label in points
  #ytick.color          : k      # color of the tick labels
  #ytick.labelsize      : medium # fontsize of the tick labels
-#ytick.direction      : in     # direction: in, out, or inout
+#ytick.direction      : out    # direction: in, out, or inout
+#ytick.minor.visible  : False  # visibility of minor ticks on y-axis
+#ytick.major.left     : True   # draw y axis left major ticks
+#ytick.major.right    : True   # draw y axis right major ticks
+#ytick.minor.left     : True   # draw y axis left minor ticks
+#ytick.minor.right    : True   # draw y axis right minor ticks
  
  
  ### GRIDS
-#grid.color       :   black   # grid color
-#grid.linestyle   :   :       # dotted
-#grid.linewidth   :   0.5     # in points
-#grid.alpha       :   1.0     # transparency, between 0.0 and 1.0
+#grid.color       :   b0b0b0    # grid color
+#grid.linestyle   :   -         # solid
+#grid.linewidth   :   0.8       # in points
+#grid.alpha       :   1.0       # transparency, between 0.0 and 1.0
  
  ### Legend
-#legend.fancybox      : False  # if True, use a rounded box for the
-                               # legend, else a rectangle
-#legend.isaxes        : True
-#legend.numpoints     : 2      # the number of points in the legend line
-#legend.fontsize      : large
-#legend.borderpad     : 0.5    # border whitespace in fontsize units
-#legend.markerscale   : 1.0    # the relative size of legend markers vs. original
-# the following dimensions are in axes coords
-#legend.labelspacing  : 0.5    # the vertical space between the legend entries in fraction of fontsize
-#legend.handlelength  : 2.     # the length of the legend lines in fraction of fontsize
-#legend.handleheight  : 0.7     # the height of the legend handle in fraction of fontsize
-#legend.handletextpad : 0.8    # the space between the legend line and legend text in fraction of fontsize
-#legend.borderaxespad : 0.5   # the border between the axes and legend edge in fraction of fontsize
-#legend.columnspacing : 2.    # the border between the axes and legend edge in fraction of fontsize
-#legend.shadow        : False
-#legend.frameon       : True   # whether or not to draw a frame around legend
-#legend.framealpha    : None    # opacity of of legend frame
-#legend.scatterpoints : 3 # number of scatter points
+#legend.loc           : best
+#legend.frameon       : True     # if True, draw the legend on a background patch
+#legend.framealpha    : 0.8      # legend patch transparency
+#legend.facecolor     : inherit  # inherit from axes.facecolor; or color spec
+#legend.edgecolor     : 0.8      # background patch boundary color
+#legend.fancybox      : True     # if True, use a rounded box for the
+                                 # legend background, else a rectangle
+#legend.shadow        : False    # if True, give background a shadow effect
+#legend.numpoints     : 1        # the number of marker points in the legend line
+#legend.scatterpoints : 1        # number of scatter points
+#legend.markerscale   : 1.0      # the relative size of legend markers vs. original
+#legend.fontsize      : medium
+# Dimensions as fraction of fontsize:
+#legend.borderpad     : 0.4      # border whitespace
+#legend.labelspacing  : 0.5      # the vertical space between the legend entries
+#legend.handlelength  : 2.0      # the length of the legend lines
+#legend.handleheight  : 0.7      # the height of the legend handle
+#legend.handletextpad : 0.8      # the space between the legend line and legend text
+#legend.borderaxespad : 0.5      # the border between the axes and legend edge
+#legend.columnspacing : 2.0      # column separation
  
  ### FIGURE
  # See http://matplotlib.org/api/figure_api.html#matplotlib.figure.Figure
-#figure.titlesize : medium     # size of the figure title
+#figure.titlesize : large      # size of the figure title (Figure.suptitle())
  #figure.titleweight : normal   # weight of the figure title
-#figure.figsize   : 8, 6    # figure size in inches
-#figure.dpi       : 80      # figure dots per inch
-#figure.facecolor : 0.75    # figure facecolor; 0.75 is scalar gray
+#figure.figsize   : 6.4, 4.8   # figure size in inches
+#figure.dpi       : 100      # figure dots per inch
+#figure.facecolor : white   # figure facecolor; 0.75 is scalar gray
  #figure.edgecolor : white   # figure edgecolor
  #figure.autolayout : False  # When True, automatically adjust subplot
                              # parameters to make the plot fit the figure
@@ -342,32 +439,42 @@ backend      : TkAgg
                                 # If less than one this feature is disabled.
  
  # The figure subplot parameters.  All dimensions are a fraction of the
-# figure width or height
  #figure.subplot.left    : 0.125  # the left side of the subplots of the figure
  #figure.subplot.right   : 0.9    # the right side of the subplots of the figure
-#figure.subplot.bottom  : 0.1    # the bottom of the subplots of the figure
-#figure.subplot.top     : 0.9    # the top of the subplots of the figure
-#figure.subplot.wspace  : 0.2    # the amount of width reserved for blank space between subplots
-#figure.subplot.hspace  : 0.2    # the amount of height reserved for white space between subplots
+#figure.subplot.bottom  : 0.11    # the bottom of the subplots of the figure
+#figure.subplot.top     : 0.88    # the top of the subplots of the figure
+#figure.subplot.wspace  : 0.2    # the amount of width reserved for blank space between subplots,
+                                 # expressed as a fraction of the average axis width
+#figure.subplot.hspace  : 0.2    # the amount of height reserved for white space between subplots,
+                                 # expressed as a fraction of the average axis height
+
  
  ### IMAGES
  #image.aspect : equal             # equal | auto | a number
-#image.interpolation  : bilinear  # see help(imshow) for options
-#image.cmap   : jet               # gray | jet etc...
+#image.interpolation  : nearest   # see help(imshow) for options
+#image.cmap   : viridis           # A colormap name, gray etc...
  #image.lut    : 256               # the size of the colormap lookup table
  #image.origin : upper             # lower | upper
-#image.resample  : False
-#image.composite_image : True     # When True, all the images on a set of axes are 
-                                  # combined into a single composite image before 
-                                  # saving a figure as a vector graphics file, 
+#image.resample  : True
+#image.composite_image : True     # When True, all the images on a set of axes are
+                                  # combined into a single composite image before
+                                  # saving a figure as a vector graphics file,
                                    # such as a PDF.
  
  ### CONTOUR PLOTS
-#contour.negative_linestyle : dashed # dashed | solid
+#contour.negative_linestyle : dashed # string or on-off ink sequence
  #contour.corner_mask        : True   # True | False | legacy
  
  ### ERRORBAR PLOTS
-#errorbar.capsize : 3             # length of end cap on error bars in pixels
+#errorbar.capsize : 0             # length of end cap on error bars in pixels
+
+### HISTOGRAM PLOTS
+#hist.bins : 10                   # The default number of histogram bins.
+                                  # If Numpy 1.11 or later is
+                                  # installed, may also be `auto`
+
+### SCATTER PLOTS
+#scatter.marker : o               # The default marker type for scatter plots.
  
  ### Agg rendering
  ### Warning: experimental, 2008/10/10
@@ -400,7 +507,7 @@ backend      : TkAgg
  # the default savefig params can be different from the display params
  # e.g., you may want a higher resolution, or to make the figure
  # background white
-#savefig.dpi         : 100      # figure dots per inch
+#savefig.dpi         : figure   # figure dots per inch or 'figure'
  #savefig.facecolor   : white    # figure facecolor when saving
  #savefig.edgecolor   : white    # figure edgecolor when saving
  #savefig.format      : png      # png, ps, pdf, svg
@@ -436,12 +543,13 @@ backend      : TkAgg
  
  # svg backend params
  #svg.image_inline : True       # write raster image data directly into the svg file
-#svg.image_noscale : False     # suppress scaling of raster data embedded in SVG
  #svg.fonttype : 'path'         # How to handle SVG fonts:
  #    'none': Assume fonts are installed on the machine where the SVG will be viewed.
  #    'path': Embed characters as paths -- supported by most SVG renderers
  #    'svgfont': Embed characters as SVG fonts -- supported only by Chrome,
  #               Opera and Safari
+#svg.hashsalt : None           # if not None, use this string as hash salt
+                               # instead of uuid4
  
  # docstring params
  #docstring.hardcopy = False  # set this when you want to generate hardcopy docstring
@@ -470,7 +578,7 @@ backend      : TkAgg
  # Customize these settings according to your needs.
  # Leave the field(s) empty if you don't need a key-map. (i.e., fullscreen : '')
  
-#keymap.fullscreen : f               # toggling
+#keymap.fullscreen : f, ctrl+f       # toggling
  #keymap.home : h, r, home            # home or reset mnemonic
  #keymap.back : left, c, backspace    # forward / backward keys to enable
  #keymap.forward : right, v           #   left handed quick navigation
@@ -478,7 +586,8 @@ backend      : TkAgg
  #keymap.zoom : o                     # zoom mnemonic
  #keymap.save : s                     # saving current figure
  #keymap.quit : ctrl+w, cmd+w         # close the current figure
-#keymap.grid : g                     # switching on/off a grid in current axes
+#keymap.grid : g                     # switching on/off major grids in current axes
+#keymap.grid_minor : G               # switching on/off minor grids in current axes
  #keymap.yscale : l                   # toggle scaling of y-axes ('log'/'linear')
  #keymap.xscale : L, k                # toggle scaling of x-axes ('log'/'linear')
  #keymap.all_axes : a                 # enable all axes
@@ -491,10 +600,11 @@ backend      : TkAgg
                                     # the IPython notebook. 'html5' uses
                                     # HTML5 video tag.
  #animation.writer : ffmpeg         # MovieWriter 'backend' to use
-#animation.codec : mpeg4           # Codec to use for writing movie
+#animation.codec : h264            # Codec to use for writing movie
  #animation.bitrate: -1             # Controls size/quality tradeoff for movie.
                                     # -1 implies let utility auto-determine
  #animation.frame_format: 'png'     # Controls frame format used by temp files
+#animation.html_args: ''           # Additional arguments to pass to html writer
  #animation.ffmpeg_path: 'ffmpeg'   # Path to ffmpeg binary. Without full path
                                     # $PATH is searched
  #animation.ffmpeg_args: ''         # Additional arguments to pass to ffmpeg
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/nanorc b/nanorc

index 7922c7f6ad67d906b8a21172fa212911eafc63d7..d3436186976c7e17bdb5ae55b0bd9077a7e6c415 100644 (file)
--- a/nanorc
+++ b/nanorc
@@ -15,10 +15,9 @@
  ## its end.  For example, for the "brackets" option, ""')>]}" will match
  ## ", ', ), >, ], and }.
  
-## Silently ignore problems with unknown directives in the nanorc file.
-## Useful when your nanorc file might be read on systems with multiple
-## versions of nano installed (e.g. your home directory is on NFS).
-# set quiet
+## When soft line wrapping is enabled, make it wrap lines at blanks
+## (tabs and spaces) instead of always at the edge of the screen.
+# set atblanks
  
  ## Use auto-indentation.
  # set autoindent
@@ -29,9 +28,6 @@
  ## The directory to put unique backup files in.
  # set backupdir ""
  
-## Do backwards searches by default.
-# set backwards
-
  ## Use bold text instead of reverse video text.
  # set boldtext
  
@@ -44,13 +40,14 @@
  ## Do case-sensitive searches by default.
  # set casesensitive
  
-## Constantly display the cursor position in the statusbar.  Note that
+## Constantly display the cursor position in the status bar.  Note that
  ## this overrides "quickblank".
  # set constantshow
  ## (The old form, 'const', is deprecated.)
  
-## Use cut-to-end-of-line by default.
-# set cut
+## Use cut-from-cursor-to-end-of-line by default.
+# set cutfromcursor
+## (The old form, 'cut', is deprecated.)
  
  ## Set the line length for wrapping text and justifying paragraphs.
  ## If the value is 0 or less, the wrapping point will be the screen
@@ -60,11 +57,11 @@
  ## Remember the used search/replace strings for the next session.
  set historylog
  
-## Have the justify command kill whitespace at the end of lines
-# set justifytrim
+## Display line numbers to the left of the text.
+# set linenumbers
  
  ## Enable vim-style lock-files.  This is just to let a vim user know you
-## are editing a file [s]he is trying to edit and vice versa. There are
+## are editing a file [s]he is trying to edit and vice versa.  There are
  ## no plans to implement vim-style undo state in these files.
  set locking
  
@@ -73,7 +70,7 @@ set locking
  ## come before the latter set, and both must be in the same order.
  # set matchbrackets "(<[{)>]}"
  
-## Use the blank line below the titlebar as extra editing space.
+## Use the blank line below the title bar as extra editing space.
  # set morespace
  
  ## Enable mouse support, if available for your system.  When enabled,
@@ -92,6 +89,10 @@ set locking
  ## Don't display the helpful shortcut lists at the bottom of the screen.
  # set nohelp
  
+## Don't pause between warnings at startup.  Which means that only the
+## last one will be readable (when there are multiple ones).
+# set nopauses
+
  ## Don't add newlines to the ends of files.
  # set nonewlines
  
@@ -117,8 +118,8 @@ set nowrap
  ## sentences.
  # set punct "!.?"
  
-## Do quick statusbar blanking.  Statusbar messages will disappear after
-## 1 keystroke instead of 26.  Note that "const" overrides this.
+## Do quick status-bar blanking.  Status-bar messages will disappear after
+## 1 keystroke instead of 26.  Note that "constantshow" overrides this.
  # set quickblank
  
  ## The email-quote string, used to justify email-quoted paragraphs.
@@ -138,6 +139,10 @@ set nowrap
  ## Do extended regular expression searches by default.
  # set regexp
  
+## Put the cursor on the highlighted item in the file browser;
+## useful for people who use a braille display.
+# set showcursor
+
  ## Make the Home key smarter.  When Home is pressed anywhere but at the
  ## very beginning of non-whitespace characters on a line, the cursor
  ## will jump to that beginning (either forwards or backwards).  If the
@@ -152,7 +157,7 @@ set nowrap
  # set softwrap
  
  ## Use this spelling checker instead of the internal one.  This option
-## does not properly have a default value.
+## does not have a default value.
  # set speller "aspell -x -c"
  
  ## Allow nano to be suspended.
@@ -167,6 +172,9 @@ set suspend
  ## Save automatically on exit; don't prompt.
  # set tempfile
  
+## Snip whitespace at the end of lines when justifying or hard-wrapping.
+# set trimblanks
+
  ## Disallow file modification.  Why would you want this in an rcfile? ;)
  # set view
  
@@ -178,17 +186,31 @@ set suspend
  ## The default otherwise:
  # set whitespace ">."
  
-## Detect word boundaries more accurately by treating punctuation
+## Detect word boundaries differently by treating punctuation
  ## characters as parts of words.
  # set wordbounds
  
+## The characters (besides alphanumeric ones) that should be considered
+## as parts of words.  This option does not have a default value.  When
+## set, it overrides option 'set wordbounds'.
+# set wordchars "<_>."
+
  
  ## Paint the interface elements of nano.
-## This is an example; by default there are no colors.
+## These are examples; by default there are no colors.
  # set titlecolor brightwhite,blue
  # set statuscolor brightwhite,green
-# set keycolor green
-# set functioncolor yellow
+# set selectedcolor brightwhite,magenta
+# set numbercolor cyan
+# set keycolor cyan
+# set functioncolor green
+## In root's .nanorc you might want to use:
+# set titlecolor brightwhite,red
+# set statuscolor brightwhite,red
+# set selectedcolor brightwhite,cyan
+# set numbercolor magenta
+# set keycolor brightmagenta
+# set functioncolor magenta
  
  
  ## Setup of syntax coloring.
@@ -239,11 +261,8 @@ include "/usr/share/nano/*.nanorc"
  ## Key bindings.
  ## See nanorc(5) (section REBINDING KEYS) for more details on this.
  ##
-## The following five functions are not bound to any key by default.
-## You may wish to choose different keys than the ones suggested here.
-# bind ^S savefile main
-# bind M-Q findprevious main
-# bind M-W findnext main
+## The following two functions are not bound to any key by default.
+## You may wish to choose other keys than the ones suggested here.
  # bind M-B cutwordleft main
  # bind M-N cutwordright main
  
diff --git a/network/if-down.d/upstart b/network/if-down.d/upstart

deleted file mode 100755 (executable)

index 51e20b3..0000000
--- a/network/if-down.d/upstart
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-if [ -e /lib/lsb/init-functions ]; then
-    . /lib/lsb/init-functions
-fi
-
-if ! init_is_upstart; then
-    exit 0
-fi
-
-# Let's ignore meta entries (ifdown -a)
-if [ "$ADDRFAM" = "meta" ]; then
-    exit 0
-fi
-
-initctl emit -n net-device-down \
-       "IFACE=$IFACE" \
-       "LOGICAL=$LOGICAL" \
-       "ADDRFAM=$ADDRFAM" \
-       "METHOD=$METHOD"
diff --git a/network/if-post-down.d/wireless-tools b/network/if-post-down.d/wireless-tools

index 997956466256147e0f27dd2fa37dba5dae1c1fc1..099e3909798d87e73dab7f52fdb18a53548abe40 100755 (executable)
--- a/network/if-post-down.d/wireless-tools
+++ b/network/if-post-down.d/wireless-tools
@@ -6,6 +6,20 @@ if [ ! -x $IWCONFIG ]; then
         exit 0
  fi
  
+# check if this is a 802.11 device we're supposed to be effecting
+case "${IF_WIRELESS:-enable}" in
+       wireless-tools|iwconfig)
+               # *we* and not some other 802.11 tool should be used
+       ;;
+       true|yes|enable|1)
+               # 802.11 should be used on this device, check for extensions
+               $IWCONFIG $IFACE >/dev/null 2>&1 || exit 0
+       ;;
+       *)
+               exit 0
+       ;;
+esac
+
  apply_settings()
  {
         if [ -n "$IF_WIRELESS_MODE" ]; then
diff --git a/network/if-pre-up.d/wireless-tools b/network/if-pre-up.d/wireless-tools

index beba22d963035451b6df5522c017a6948a7a631b..1525c908a513b7002d40b6f6c35e3119568df305 100755 (executable)
--- a/network/if-pre-up.d/wireless-tools
+++ b/network/if-pre-up.d/wireless-tools
@@ -6,6 +6,20 @@ if [ ! -x $IWCONFIG ]; then
    exit 0
  fi
  
+# check if this is a 802.11 device we're supposed to be effecting
+case "${IF_WIRELESS:-enable}" in
+       wireless-tools|iwconfig)
+               # *we* and not some other 802.11 tool should be used
+       ;;
+       true|yes|enable|1)
+               # 802.11 should be used on this device, check for extensions
+               $IWCONFIG $IFACE >/dev/null 2>&1 || exit 0
+       ;;
+       *)
+               exit 0
+       ;;
+esac
+
  # The wireless driver madness:
  #
  # - Some drivers want everything to be configured before bringing the interface up
diff --git a/network/if-up.d/upstart b/network/if-up.d/upstart

deleted file mode 100755 (executable)

index 8690c86..0000000
--- a/network/if-up.d/upstart
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh -e
-MARK_DEV_PREFIX="/run/network/ifup."
-MARK_STATIC_NETWORK_EMITTED="/run/network/static-network-up-emitted"
-
-if [ -e /lib/lsb/init-functions ]; then
-    . /lib/lsb/init-functions
-fi
-
-if ! init_is_upstart; then
-    exit 0
-fi
-
-# Let's ignore meta entries (ifup -a)
-if [ "$ADDRFAM" = "meta" ]; then
-    exit 0
-fi
-
-# lo emission handled by /etc/init/network-interface.conf
-if [ "$IFACE" != lo ]; then
-    initctl emit -n net-device-up \
-        "IFACE=$IFACE" \
-        "LOGICAL=$LOGICAL" \
-        "ADDRFAM=$ADDRFAM" \
-        "METHOD=$METHOD"
-fi
-
-get_auto_interfaces() {
-       # write to stdout a list of interfaces configured as 'auto' in interfaces(5)
-       local found=""
-       # stderr redirected as it outputs things like:
-       # Ignoring unknown interface eth0=eth0.
-       found=$(ifquery --list --allow auto 2>/dev/null) || return
-       set -- ${found}
-       echo "$@"
-}
-
-all_interfaces_up() {
-       # return true if all interfaces listed in /etc/network/interfaces as 'auto'
-       # are up.  if no interfaces are found there, then "all [given] were up"
-       local prefix="$1" iface=""
-       for iface in $(get_auto_interfaces); do
-               # if cur interface does is not up, then all have not been brought up
-               [ -f "${prefix}${iface}" ] || return 1
-       done
-       return 0
-}
-
-# touch our own "marker" indicating that this interface has been brought up.
-: > "${MARK_DEV_PREFIX}$IFACE"
-
-if all_interfaces_up "${MARK_DEV_PREFIX}" &&
-       mkdir "${MARK_STATIC_NETWORK_EMITTED}" 2>/dev/null; then
-       initctl emit --no-wait static-network-up
-fi
diff --git a/openal/alsoft.conf b/openal/alsoft.conf

index 2e6dd92a74ad1eb01b79ea22541350a9b07a078d..3e7d0eec474a5df5b13ad11c23b83eb4ab6aecca 100644 (file)
--- a/openal/alsoft.conf
+++ b/openal/alsoft.conf
@@ -8,12 +8,18 @@
  # specifying "$HOME/file.ext" would typically result in something like
  # "/home/user/file.ext". To specify an actual "$" character, use "$$".
  #
+# Device-specific values may be specified by including the device name in the
+# block name, with "general" replaced by the device name. That is, general
+# options for the device "Name of Device" would be in the [Name of Device]
+# block, while ALSA options would be in the [alsa/Name of Device] block.
+# Options marked as "(global)" are not influenced by the device.
+#
  # The system-wide settings can be put in /etc/openal/alsoft.conf and user-
  # specific override settings in $HOME/.alsoftrc.
  # For Windows, these settings should go into $AppData\alsoft.ini
  #
-# Option and block names are case-insenstive. The supplied values are only
-# hints and may not be honored (though generally it'll try to get as close as
+# Option and block names are case-senstive. The supplied values are only hints
+# and may not be honored (though generally it'll try to get as close as
  # possible). Note: options that are left unset may default to app- or system-
  # specified values. These are the current available settings:
  
@@ -22,18 +28,30 @@
  ##
  [general]
  
-## disable-cpu-exts:
+## disable-cpu-exts: (global)
  #  Disables use of specialized methods that use specific CPU intrinsics.
  #  Certain methods may utilize CPU extensions for improved performance, and
  #  this option is useful for preventing some or all of those methods from being
-#  used. The available extensions are: sse, sse2, sse4.1, and neon. Specifying
-#  'all' disables use of all such specialized methods.
+#  used. The available extensions are: sse, sse2, sse3, sse4.1, and neon.
+#  Specifying 'all' disables use of all such specialized methods.
  #disable-cpu-exts =
  
+## drivers: (global)
+#  Sets the backend driver list order, comma-seperated. Unknown backends and
+#  duplicated names are ignored. Unlisted backends won't be considered for use
+#  unless the list is ended with a comma (e.g. 'oss,' will try OSS first before
+#  other backends, while 'oss' will try OSS only). Backends prepended with -
+#  won't be considered for use (e.g. '-oss,' will try all available backends
+#  except OSS). An empty list means to try all backends.
+#drivers =
+
  ## channels:
  #  Sets the output channel configuration. If left unspecified, one will try to
  #  be detected from the system, and defaulting to stereo. The available values
-#  are: mono, stereo, quad, surround51, surround61, surround71
+#  are: mono, stereo, quad, surround51, surround51rear, surround61, surround71,
+#  ambi1, ambi2, ambi3. Note that the ambi* configurations provide ambisonic
+#  channels of the given order (using ACN ordering and SN3D normalization by
+#  default), which need to be decoded to play correctly on speakers.
  #channels =
  
  ## sample-type:
@@ -48,28 +66,71 @@
  #  float32 - 32-bit float
  #sample-type = float32
  
+## frequency:
+#  Sets the output frequency. If left unspecified it will try to detect a
+#  default from the system, otherwise it will default to 44100.
+#frequency =
+
+## period_size:
+#  Sets the update period size, in frames. This is the number of frames needed
+#  for each mixing update. Acceptable values range between 64 and 8192.
+#period_size = 1024
+
+## periods:
+#  Sets the number of update periods. Higher values create a larger mix ahead,
+#  which helps protect against skips when the CPU is under load, but increases
+#  the delay between a sound getting mixed and being heard. Acceptable values
+#  range between 2 and 16.
+#periods = 3
+
+## stereo-mode:
+#  Specifies if stereo output is treated as being headphones or speakers. With
+#  headphones, HRTF or crossfeed filters may be used for better audio quality.
+#  Valid settings are auto, speakers, and headphones.
+#stereo-mode = auto
+
+## stereo-encoding:
+#  Specifies the encoding method for non-HRTF stereo output. 'panpot' (default)
+#  uses standard amplitude panning (aka pair-wise, stereo pair, etc) between
+#  -30 and +30 degrees, while 'uhj' creates stereo-compatible two-channel UHJ
+#  output, which encodes some surround sound information into stereo output
+#  that can be decoded with a surround sound receiver. If crossfeed filters are
+#  used, UHJ is disabled.
+#stereo-encoding = panpot
+
+## ambi-format:
+#  Specifies the channel order and normalization for the "ambi*" set of channel
+#  configurations. Valid settings are: fuma, acn+sn3d, acn+n3d
+#ambi-format = acn+sn3d
+
  ## hrtf:
-#  Enables HRTF filters. These filters provide for better sound spatialization
-#  while using headphones. The default filter will only work when output is
-#  44100hz stereo. While HRTF is active, the cf_level option is disabled.
-#  Default is disabled since stereo speaker output quality may suffer.
-#hrtf = false
-
-## hrtf_tables
-#  Specifies a comma-separated list of files containing HRTF data sets. The
-#  format of the files are described in hrtf.txt. The filenames may contain
-#  these markers, which will be replaced as needed:
-#  %r - Device sampling rate
-#  %% - Percent sign (%)
-#  The listed files are relative to system-dependant data directories. On
-#  Windows this is:
+#  Controls HRTF processing. These filters provide better spatialization of
+#  sounds while using headphones, but do require a bit more CPU power. The
+#  default filters will only work with 44100hz or 48000hz stereo output. While
+#  HRTF is used, the cf_level option is ignored. Setting this to auto (default)
+#  will allow HRTF to be used when headphones are detected or the app requests
+#  it, while setting true or false will forcefully enable or disable HRTF
+#  respectively.
+#hrtf = auto
+
+## default-hrtf:
+#  Specifies the default HRTF to use. When multiple HRTFs are available, this
+#  determines the preferred one to use if none are specifically requested. Note
+#  that this is the enumerated HRTF name, not necessarily the filename.
+#default-hrtf =
+
+## hrtf-paths:
+#  Specifies a comma-separated list of paths containing HRTF data sets. The
+#  format of the files are described in docs/hrtf.txt. The files within the
+#  directories must have the .mhr file extension to be recognized. By default,
+#  OS-dependent data paths will be used. They will also be used if the list
+#  ends with a comma. On Windows this is:
  #  $AppData\openal\hrtf
  #  And on other systems, it's (in order):
  #  $XDG_DATA_HOME/openal/hrtf  (defaults to $HOME/.local/share/openal/hrtf)
  #  $XDG_DATA_DIRS/openal/hrtf  (defaults to /usr/local/share/openal/hrtf and
  #                               /usr/share/openal/hrtf)
-#  An absolute path may also be specified, if the given file is elsewhere.
-#hrtf_tables = default-%r.mhr
+#hrtf-paths =
  
  ## cf_level:
  #  Sets the crossfeed level for stereo output. Valid values are:
@@ -84,28 +145,17 @@
  #  stereo modes.
  #cf_level = 0
  
-## wide-stereo:
-#  Specifies that stereo sources are given a width of about 120 degrees on each
-#  channel, centering on -90 (left) and +90 (right), as opposed to being points
-#  placed at -30 (left) and +30 (right). This can be useful for surround-sound
-#  to give stereo sources a more encompassing sound. Note that the sound's
-#  overall volume will be slightly reduced to account for the extra output.
-#wide-stereo = false
-
-## frequency:
-#  Sets the output frequency. If left unspecified it will try to detect a
-#  default from the system, otherwise it will default to 44100.
-#frequency =
-
-## resampler:
+## resampler: (global)
  #  Selects the resampler used when mixing sources. Valid values are:
  #  point - nearest sample, no interpolation
  #  linear - extrapolates samples using a linear slope between samples
-#  cubic - extrapolates samples using a Catmull-Rom spline
+#  sinc4 - extrapolates samples using a 4-point Sinc filter
+#  bsinc - extrapolates samples using a band-limited Sinc filter (varying
+#          between 12 and 24 points, with anti-aliasing)
  #  Specifying other values will result in using the default (linear).
  #resampler = linear
  
-## rt-prio:
+## rt-prio: (global)
  #  Sets real-time priority for the mixing thread. Not all drivers may use this
  #  (eg. PortAudio) as they already control the priority of the mixing thread.
  #  0 and negative values will disable it. Note that this may constitute a
@@ -114,72 +164,57 @@
  #  disabled.
  #rt-prio = 0
  
-## period_size:
-#  Sets the update period size, in frames. This is the number of frames needed
-#  for each mixing update. Acceptable values range between 64 and 8192.
-#period_size = 1024
-
-## periods:
-#  Sets the number of update periods. Higher values create a larger mix ahead,
-#  which helps protect against skips when the CPU is under load, but increases
-#  the delay between a sound getting mixed and being heard. Acceptable values
-#  range between 2 and 16.
-#periods = 4
-
  ## sources:
  #  Sets the maximum number of allocatable sources. Lower values may help for
  #  systems with apps that try to play more sounds than the CPU can handle.
  #sources = 256
  
-## drivers:
-#  Sets the backend driver list order, comma-seperated. Unknown backends and
-#  duplicated names are ignored. Unlisted backends won't be considered for use
-#  unless the list is ended with a comma (e.g. 'oss,' will try OSS first before
-#  other backends, while 'oss' will try OSS only). Backends prepended with -
-#  won't be considered for use (e.g. '-oss,' will try all available backends
-#  except OSS). An empty list means to try all backends.
-#drivers =
-
-## excludefx:
-#  Sets which effects to exclude, preventing apps from using them. This can
-#  help for apps that try to use effects which are too CPU intensive for the
-#  system to handle. Available effects are: eaxreverb,reverb,autowah,chorus,
-#  compressor,distortion,echo,equalizer,flanger,modulator,dedicated
-#excludefx =
-
  ## slots:
  #  Sets the maximum number of Auxiliary Effect Slots an app can create. A slot
  #  can use a non-negligible amount of CPU time if an effect is set on it even
  #  if no sources are feeding it, so this may help when apps use more than the
  #  system can handle.
-#slots = 4
+#slots = 64
  
  ## sends:
-#  Sets the number of auxiliary sends per source. When not specified (default),
-#  it allows the app to request how many it wants. The maximum value currently
-#  possible is 4.
-#sends =
-
-## layout:
-#  Sets the virtual speaker layout. Values are specified in degrees, where 0 is
-#  straight in front, negative goes left, and positive goes right. Unspecified
-#  speakers will remain at their default positions (which are dependant on the
-#  output format). Available speakers are back-left(bl), side-left(sl), front-
-#  left(fl), front-center(fc), front-right(fr), side-right(sr), back-right(br),
-#  and back-center(bc).
-#layout =
-
-## layout_*:
-#  Channel-specific layouts may be specified to override the layout option. The
-#  same speakers as the layout option are available, and the default settings
-#  are shown below.
-#layout_stereo     = fl=-90, fr=90
-#layout_quad       = fl=-45, fr=45, bl=-135, br=135
-#layout_surround51 = fl=-30, fr=30, fc=0, bl=-110, br=110
-#layout_surround61 = fl=-30, fr=30, fc=0, sl=-90, sr=90, bc=180
-#layout_surround71 = fl=-30, fr=30, fc=0, sl=-90, sr=90, bl=-150, br=150
-
-## default-reverb:
+#  Limits the number of auxiliary sends allowed per source. Setting this higher
+#  than the default has no effect.
+#sends = 16
+
+## output-limiter:
+#  Applies a gain limiter on the final mixed output. This reduces the volume
+#  when the output samples would otherwise clamp, avoiding excessive clipping
+#  noise.
+#output-limiter = true
+
+## dither:
+#  Applies dithering on the final mix, for 8- and 16-bit output by default.
+#  This replaces the distortion created by nearest-value quantization with low-
+#  level whitenoise.
+#dither = true
+
+## dither-depth:
+#  Quantization bit-depth for dithered output. A value of 0 (or less) will
+#  match the output sample depth. For int32, uint32, and float32 output, 0 will
+#  disable dithering because they're at or beyond the rendered precision. The
+#  maximum dither depth is 24.
+#dither-depth = 0
+
+## volume-adjust:
+#  A global volume adjustment for source output, expressed in decibels. The
+#  value is logarithmic, so +6 will be a scale of (approximately) 2x, +12 will
+#  be a scale of 4x, etc. Similarly, -6 will be x1/2, and -12 is about x1/4. A
+#  value of 0 means no change.
+#volume-adjust = 0
+
+## excludefx: (global)
+#  Sets which effects to exclude, preventing apps from using them. This can
+#  help for apps that try to use effects which are too CPU intensive for the
+#  system to handle. Available effects are: eaxreverb,reverb,chorus,compressor,
+#  distortion,echo,equalizer,flanger,modulator,dedicated
+#excludefx =
+
+## default-reverb: (global)
  #  A reverb preset that applies by default to all sources on send 0
  #  (applications that set their own slots on send 0 will override this).
  #  Available presets are: None, Generic, PaddedCell, Room, Bathroom,
@@ -188,54 +223,94 @@
  #  Quarry, Plain, ParkingLot, SewerPipe, Underwater, Drugged, Dizzy, Psychotic.
  #default-reverb =
  
-## trap-alc-error:
+## trap-alc-error: (global)
  #  Generates a SIGTRAP signal when an ALC device error is generated, on systems
  #  that support it. This helps when debugging, while trying to find the cause
  #  of a device error. On Windows, a breakpoint exception is generated.
  #trap-alc-error = false
  
-## trap-al-error:
+## trap-al-error: (global)
  #  Generates a SIGTRAP signal when an AL context error is generated, on systems
  #  that support it. This helps when debugging, while trying to find the cause
  #  of a context error. On Windows, a breakpoint exception is generated.
  #trap-al-error = false
  
  ##
-## MIDI stuff (EXPERIMENTAL)
+## Ambisonic decoder stuff
  ##
-[midi]
-
-## soundfont:
-#  A default soundfont (sf2 format). Used when an app requests the system
-#  default. The listed file is relative to system-dependant data directories.
-#  On Windows this is:
-#  $AppData\openal\soundfonts
-#  And on other systems, it's (in order):
-#  $XDG_DATA_HOME/openal/soundfonts
-#  $XDG_DATA_DIRS/openal/soundfonts
-#  An absolute path may also be specified, if the given file is elsewhere.
-#soundfont =
-
-## volume:
-#  Additional attenuation applied to MIDI output, expressed in decibels. This
-#  is used to help keep the mix from clipping, and so must be 0 or less. The
-#  value is logarithmic, so -6 will be about half amplitude, and -12 about
-#  1/4th. The default is roughly -13.9794 (0.2, or 1/5th).
-#volume =
+[decoder]
+
+## hq-mode:
+#  Enables a high-quality ambisonic decoder. This mode is capable of frequency-
+#  dependent processing, creating a better reproduction of 3D sound rendering
+#  over surround sound speakers. Enabling this also requires specifying decoder
+#  configuration files for the appropriate speaker configuration you intend to
+#  use (see the quad, surround51, etc options below). Currently, up to third-
+#  order decoding is supported.
+hq-mode = false
+
+## distance-comp:
+#  Enables compensation for the speakers' relative distances to the listener.
+#  This applies the necessary delays and attenuation to make the speakers
+#  behave as though they are all equidistant, which is important for proper
+#  playback of 3D sound rendering. Requires the proper distances to be
+#  specified in the decoder configuration file.
+distance-comp = true
+
+## nfc:
+#  Enables near-field control filters. This simulates and compensates for low-
+#  frequency effects caused by the curvature of nearby sound-waves, which
+#  creates a more realistic perception of sound distance. Note that the effect
+#  may be stronger or weaker than intended if the application doesn't use or
+#  specify an appropriate unit scale, or if incorrect speaker distances are set
+#  in the decoder configuration file. Requires hq-mode to be enabled.
+nfc = true
+
+## nfc-ref-delay
+#  Specifies the reference delay value for ambisonic output. When channels is
+#  set to one of the ambi* formats, this option enables NFC-HOA output with the
+#  specified Reference Delay parameter. The specified value can then be shared
+#  with an appropriate NFC-HOA decoder to reproduce correct near-field effects.
+#  Keep in mind that despite being designed for higher-order ambisonics, this
+#  applies to first-order output all the same. When left unset, normal output
+#  is created with no near-field simulation.
+nfc-ref-delay =
+
+## quad:
+#  Decoder configuration file for Quadrophonic channel output. See
+#  docs/ambdec.txt for a description of the file format.
+quad =
+
+## surround51:
+#  Decoder configuration file for 5.1 Surround (Side and Rear) channel output.
+#  See docs/ambdec.txt for a description of the file format.
+surround51 =
+
+## surround61:
+#  Decoder configuration file for 6.1 Surround channel output. See
+#  docs/ambdec.txt for a description of the file format.
+surround61 =
+
+## surround71:
+#  Decoder configuration file for 7.1 Surround channel output. See
+#  docs/ambdec.txt for a description of the file format. Note: This can be used
+#  to enable 3D7.1 with the appropriate configuration and speaker placement,
+#  see docs/3D7.1.txt.
+surround71 =
  
  ##
  ## Reverb effect stuff (includes EAX reverb)
  ##
  [reverb]
  
-## boost:
+## boost: (global)
  #  A global amplification for reverb output, expressed in decibels. The value
  #  is logarithmic, so +6 will be a scale of (approximately) 2x, +12 will be a
  #  scale of 4x, etc. Similarly, -6 will be about half, and -12 about 1/4th. A
  #  value of 0 means no change.
  #boost = 0
  
-## emulate-eax:
+## emulate-eax: (global)
  #  Allows the standard reverb effect to be used in place of EAX reverb. EAX
  #  reverb processing is a bit more CPU intensive than standard, so this option
  #  allows a simpler effect to be used at the loss of some quality.
@@ -246,52 +321,59 @@
  ##
  [pulse]
  
-## spawn-server:
+## spawn-server: (global)
  #  Attempts to autospawn a PulseAudio server whenever needed (initializing the
  #  backend, enumerating devices, etc). Setting autospawn to false in Pulse's
  #  client.conf will still prevent autospawning even if this is set to true.
  #spawn-server = true
  
-## allow-moves:
+## allow-moves: (global)
  #  Allows PulseAudio to move active streams to different devices. Note that the
  #  device specifier (seen by applications) will not be updated when this
  #  occurs, and neither will the AL device configuration (sample rate, format,
  #  etc).
  #allow-moves = false
  
+## fix-rate:
+#  Specifies whether to match the playback stream's sample rate to the device's
+#  sample rate. Enabling this forces OpenAL Soft to mix sources and effects
+#  directly to the actual output rate, avoiding a second resample pass by the
+#  PulseAudio server.
+#fix-rate = false
+
  ##
  ## ALSA backend stuff
  ##
  [alsa]
  
-## device:
+## device: (global)
  #  Sets the device name for the default playback device.
  #device = default
  
-## device-prefix:
+## device-prefix: (global)
  #  Sets the prefix used by the discovered (non-default) playback devices. This
  #  will be appended with "CARD=c,DEV=d", where c is the card id and d is the
  #  device index for the requested device name.
  #device-prefix = plughw:
  
-## device-prefix-*:
+## device-prefix-*: (global)
  #  Card- and device-specific prefixes may be used to override the device-prefix
  #  option. The option may specify the card id (eg, device-prefix-NVidia), or
  #  the card id and device index (eg, device-prefix-NVidia-0). The card id is
  #  case-sensitive.
  #device-prefix- =
  
-## capture:
+## capture: (global)
  #  Sets the device name for the default capture device.
  #capture = default
  
-## capture-prefix:
+## capture-prefix: (global)
  #  Sets the prefix used by the discovered (non-default) capture devices. This
  #  will be appended with "CARD=c,DEV=d", where c is the card id and d is the
  #  device number for the requested device name.
  #capture-prefix = plughw:
  
-## capture-prefix-*:
+## capture-prefix-*: (global)
  #  Card- and device-specific prefixes may be used to override the
  #  capture-prefix option. The option may specify the card id (eg,
  #  capture-prefix-NVidia), or the card id and device index (eg,
@@ -305,16 +387,23 @@
  #  and anything else will force mmap off.
  #mmap = true
  
+## allow-resampler:
+#  Specifies whether to allow ALSA's built-in resampler. Enabling this will
+#  allow the playback device to be set to a different sample rate than the
+#  actual output, causing ALSA to apply its own resampling pass after OpenAL
+#  Soft resamples and mixes the sources and effects for output.
+#allow-resampler = false
+
  ##
  ## OSS backend stuff
  ##
  [oss]
  
-## device:
+## device: (global)
  #  Sets the device name for OSS output.
  #device = /dev/dsp
  
-## capture:
+## capture: (global)
  #  Sets the device name for OSS capture.
  #capture = /dev/dsp
  
@@ -323,7 +412,7 @@
  ##
  [solaris]
  
-## device:
+## device: (global)
  #  Sets the device name for Solaris output.
  #device = /dev/audio
  
@@ -332,13 +421,24 @@
  ##
  [qsa]
  
-## device:
-#  Sets the device name for the default playback device.
-#device = default
-
-## capture:
-#  Sets the device name for the default capture device.
-#capture = default
+##
+## JACK backend stuff
+##
+[jack]
+
+## spawn-server: (global)
+#  Attempts to autospawn a JACK server whenever needed (initializing the
+#  backend, opening devices, etc).
+#spawn-server = false
+
+## buffer-size:
+#  Sets the update buffer size, in samples, that the backend will keep buffered
+#  to handle the server's real-time processing requests. This value must be a
+#  power of 2, or else it will be rounded up to the next power of 2. If it is
+#  less than JACK's buffer update size, it will be clamped. This option may
+#  be useful in case the server's update size is too small and doesn't give the
+#  mixer time to keep enough audio available for the processing requests.
+#buffer-size = 0
  
  ##
  ## MMDevApi backend stuff
@@ -360,12 +460,12 @@
  ##
  [port]
  
-## device:
+## device: (global)
  #  Sets the device index for output. Negative values will use the default as
  #  given by PortAudio itself.
  #device = -1
  
-## capture:
+## capture: (global)
  #  Sets the device index for capture. Negative values will use the default as
  #  given by PortAudio itself.
  #capture = -1
@@ -375,8 +475,13 @@
  ##
  [wave]
  
-## file:
+## file: (global)
  #  Sets the filename of the wave file to write to. An empty name prevents the
  #  backend from opening, even when explicitly requested.
  #  THIS WILL OVERWRITE EXISTING FILES WITHOUT QUESTION!
  #file =
+
+## bformat: (global)
+#  Creates AMB format files using first-order ambisonics instead of a standard
+#  single- or multi-channel .wav file.
+#bformat = false
diff --git a/pam.d/polkit-1 b/pam.d/polkit-1

index b89027661e1cd32c9ff2afcbb7118f9245db7291..6f8af2a0ec048e9792e0d7860422e0398854144e 100644 (file)
--- a/pam.d/polkit-1
+++ b/pam.d/polkit-1
@@ -5,4 +5,4 @@
  @include common-password
  session       required   pam_env.so readenv=1 user_readenv=0
  session       required   pam_env.so readenv=1 envfile=/etc/default/locale user_readenv=0
-@include common-session
+@include common-session-noninteractive
diff --git a/passwd b/passwd

index 31f77e94543beaa2bd1a720a13bbdc8ce6dffe04..2bb22cf5177c7e60c26c57eda36c9ebeb7e571d6 100644 (file)
--- a/passwd
+++ b/passwd
@@ -48,3 +48,4 @@ mongodb:x:127:65534::/var/lib/mongodb:/bin/false
  trezord:x:999:999:TREZOR Bridge:/var:/bin/false
  susi:x:1012:1013:Susanne Weber:/home/susi:
  bitcoin:x:128:138::/var/lib/bitcoin:/bin/false
+cups-pk-helper:x:129:113:user for cups-pk-helper service,,,:/home/cups-pk-helper:/usr/sbin/nologin
diff --git a/passwd- b/passwd-

index 31f77e94543beaa2bd1a720a13bbdc8ce6dffe04..5ba380de6581a11006cb06399a77f8e957020a28 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -48,3 +48,4 @@ mongodb:x:127:65534::/var/lib/mongodb:/bin/false
  trezord:x:999:999:TREZOR Bridge:/var:/bin/false
  susi:x:1012:1013:Susanne Weber:/home/susi:
  bitcoin:x:128:138::/var/lib/bitcoin:/bin/false
+cups-pk-helper:x:129:113::/home/cups-pk-helper:/usr/sbin/nologin
diff --git a/pm/sleep.d/10_unattended-upgrades-hibernate b/pm/sleep.d/10_unattended-upgrades-hibernate

index 382b578384712217b0b4b254a741e9fbef625d91..87716117d011aa36e940561024dfc1863108e6c9 100755 (executable)
--- a/pm/sleep.d/10_unattended-upgrades-hibernate
+++ b/pm/sleep.d/10_unattended-upgrades-hibernate
@@ -23,7 +23,7 @@ fi
  case "${1}" in
          hibernate)
                  if [ -e $SHUTDOWN_HELPER ]; then
-                   $PYTHON $SHUTDOWN_HELPER
+                   $PYTHON $SHUTDOWN_HELPER --stop-only
                  fi
                  ;;
          resume|thaw)
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/profile.d/bash_completion.sh b/profile.d/bash_completion.sh

index 0df14b590b51e89db30b05b7bbcd9825df772a1f..902a7f744eb87bd1e0fe03a67b620644e94df715 100644 (file)
--- a/profile.d/bash_completion.sh
+++ b/profile.d/bash_completion.sh
@@ -1,16 +1,15 @@
  # Check for interactive bash and that we haven't already been sourced.
-if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
+if [ -n "${BASH_VERSION-}" -a -n "${PS1-}" -a -z "${BASH_COMPLETION_VERSINFO-}" ]; then
  
-# Check for recent enough version of bash.
-bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-if [ $bmajor -gt 4 ] || [ $bmajor -eq 4 -a $bminor -ge 1 ]; then
-    [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
-        . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
-    if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
-        # Source completion code.
-        . /usr/share/bash-completion/bash_completion
+    # Check for recent enough version of bash.
+    if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
+       [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
+        [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
+            . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
+        if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
+            # Source completion code.
+            . /usr/share/bash-completion/bash_completion
+        fi
      fi
-fi
-unset bash bmajor bminor
  
  fi
diff --git a/profile.d/input-method-config.sh b/profile.d/input-method-config.sh

new file mode 100644 (file)

index 0000000..dbaf4b4
--- /dev/null
+++ b/profile.d/input-method-config.sh
@@ -0,0 +1,24 @@
+# /etc/profile.d/input-method-config.sh
+#
+# This is a temporary measure which works around
+# https://launchpad.net/bugs/1720250
+
+if [ -z "$XDG_CURRENT_DESKTOP" -o -n "$GTK_IM_MODULE" ]; then
+    return
+fi
+
+. /etc/X11/Xsession.d/70im-config_launch
+if [ "$IM_CONFIG_PHASE" = 1 ]; then
+    export IM_CONFIG_PHASE=2
+    . /usr/share/im-config/xinputrc.common
+    if [ -r "$IM_CONFIG_XINPUTRC_USR" ]; then
+        . $IM_CONFIG_XINPUTRC_USR
+    elif [ -r "$IM_CONFIG_XINPUTRC_SYS" ]; then
+        . $IM_CONFIG_XINPUTRC_SYS
+    fi
+    export XMODIFIERS
+    export GTK_IM_MODULE
+    export QT_IM_MODULE
+    export QT4_IM_MODULE
+    export CLUTTER_IM_MODULE
+fi
diff --git a/psad/psad.conf b/psad/psad.conf

index ea2ef7711efd83eeab94fc03fb854c57337c6cc8..7835ab5f26040fe5acf2a34d004624a7c4deedb3 100644 (file)
--- a/psad/psad.conf
+++ b/psad/psad.conf
@@ -147,20 +147,37 @@ SHOW_ALL_SIGNATURES         N;
  ### and alerting.
  ALERTING_METHODS            ALL;
  
-### By default, psad acquires iptables log data from the /var/log/messages
-### file which the local syslog daemon (usually) writes iptables log messages
-### to.  If the ENABLE_SYSLOG_FILE variable below is set to "N", then psad
-### reconfigures syslog to write iptables log data to the
+### By default, psad checks for journalctl on systems where systemd is
+### installed. If journalctl is running, then psad will automatically acquire
+### syslog data from journalctl instead of parsing a file in the /var/log/
+### directory.
+AUTO_DETECT_JOURNALCTL      Y;
+
+### The following vars have psad acquire iptables log data from the
+### /var/log/messages file which the local syslog daemon (usually) writes
+### iptables log messages to.  If the ENABLE_SYSLOG_FILE variable below is set
+### to "N", then psad reconfigures syslog to write iptables log data to the
  ### /var/lib/psad/psadfifo fifo file where the messages are picked up by kmsgsd
  ### written to the file /var/log/psad/fwdata for analysis by psad.  On some
  ### systems, having syslog communicate log data to kmsgsd can be problematic
  ### (syslog configs and external factors such as Apparmor and SELinux can play
  ### a role here), so leaving the ENABLE_SYSLOG_FILE variable set to "Y" is
-### usually recommended.
+### usually recommended. However, if psad is running on a system where systemd
+### is installed and syslog messages are accessed via journalctl instead of
+### being written to the filesystem, then the ENABLE_FW_MSG_READ_CMD
+### functionality should be used to take over (see below).
  ENABLE_SYSLOG_FILE          Y;
  IPT_WRITE_FWDATA            Y;
  IPT_SYSLOG_FILE             /var/log/messages;
  
+### This is primarily used to acquire syslog messages from journalctl on
+### systems where systemd is running.
+ENABLE_FW_MSG_READ_CMD      N;
+FW_MSG_READ_CMD             /bin/journalctl;
+FW_MSG_READ_CMD_ARGS        -f -k;
+USE_FW_MSG_READ_CMD_ARGS    Y;
+FW_MSG_READ_MIN_PKTS        30;
+
  ### When enabled, this instructs psad to write the "msg" field
  ### associated with Snort rule matches to syslog.
  ENABLE_SIG_MSG_SYSLOG       Y;
@@ -363,8 +380,8 @@ ENABLE_AUTO_IDS             N;
  ### level >= to this value
  AUTO_IDS_DANGER_LEVEL       5;
  
-### Set the auto-blocked timeout in seconds (the default
-### is one hour).
+### Set the auto-blocked timeout in seconds (the default is one hour).
+### A value of 0 means block forever.
  AUTO_BLOCK_TIMEOUT          3600;
  
  ### Set the auto-blocked timeout in seconds for each danger
@@ -435,6 +452,9 @@ IPTABLES_PREREQ_CHECK       1;
  ### ENABLE_AUTO_IDS is also set)
  TCPWRAPPERS_BLOCK_METHOD    N;
  
+### By default, enable whois lookups against scanning IP addresses.
+ENABLE_WHOIS_LOOKUPS        Y;
+
  ### Set the whois timeout
  WHOIS_TIMEOUT               60;  ### seconds
  
@@ -453,6 +473,9 @@ ENABLE_WHOIS_FORCE_ASCII    N;
  ### is usually a good idea to leave this setting as the default of 'N'.
  ENABLE_WHOIS_FORCE_SRC_IP   N;
  
+### By default, enable reverse DNS lookups against scanning IP addresses.
+ENABLE_DNS_LOOKUPS          Y;
+
  ### Set the number of times an ip can be seen before another dns
  ### lookup is issued.
  DNS_LOOKUP_THRESHOLD        20;
@@ -474,6 +497,31 @@ EXTERNAL_SCRIPT             /bin/true;
  ### every time a scan is detected for an ip).
  EXEC_EXT_SCRIPT_PER_ALERT   N;
  
+### Enable psad to run an external script or program upon setting
+### iptables block (use at your own risk!)
+ENABLE_EXT_BLOCK_SCRIPT_EXEC      N;
+
+### Define an external program to run after a scan is blocked.
+### Note that the scan source ip can be specified on the command
+### line to the external program through the use of the "SRCIP"
+### string (along with some appropriate switch for the program).
+### Of course this is only useful if the external program knows
+### what to do with this information.
+### Example:  EXTERNAL_BLOCK_SCRIPT       /path/to/script --ip SRCIP -v;
+EXTERNAL_BLOCK_SCRIPT             /bin/true;
+
+### Some syslog daemons support a customized time stamp, so allow
+### a user-specified regex to account for this when necessary (disabled
+### by default). This regex should also extract the hostname from the
+### syslog messages as well, so the timestamp and the hostname should be
+### stored in $1 and $2 respectively. Here is an example syslog message
+### and how to extract the timestamp and hostname:
+###     2015-03-08T02:25:11.444012+02:00 servername kernel: ...
+### ...would be handled properly with:
+###     ^\s*([\d\-]+T(?:\d{2}\:){2}\d{2}\S+)\s+(\S+)\s+kernel:
+ENABLE_CUSTOM_SYSLOG_TS_RE      N;
+CUSTOM_SYSLOG_TS_RE             ^\s*((?:\S+\s+){2}\S+)\s+(\S+)\s+kernel\:;
+
  ### Disk usage variables
  DISK_CHECK_INTERVAL         300;  ### seconds
  
@@ -551,6 +599,7 @@ INSTALL_LOG_FILE            $PSAD_DIR/install.log;
  
  ### PID files
  PSAD_PID_FILE               $PSAD_RUN_DIR/psad.pid;
+PSAD_FW_READ_PID_FILE       $PSAD_RUN_DIR/psad_fw_read.pid;
  PSAD_CMDLINE_FILE           $PSAD_RUN_DIR/psad.cmd;
  KMSGSD_PID_FILE             $PSAD_RUN_DIR/kmsgsd.pid;
  PSADWATCHD_PID_FILE         $PSAD_RUN_DIR/psadwatchd.pid;
@@ -592,8 +641,8 @@ IPT_PREFIX_COUNTER_FILE     $PSAD_DIR/ipt_prefix_ctr;
  
  ### iptables command output and error collection files; these are
  ### used by IPTables::ChainMgr
-IPT_OUTPUT_FILE             $PSAD_DIR/psad.iptout;
-IPT_ERROR_FILE              $PSAD_DIR/psad.ipterr;
+IPT_OUTPUT_PATTERN          psad_iptout.XXXXXX;
+IPT_ERROR_PATTERN           psad_ipterr.XXXXXX;
  
  ### system binaries
  iptablesCmd      /sbin/iptables;
diff --git a/psad/signatures b/psad/signatures

index 3bc0501c216f64455a98229a2e0009e098d13c7a..5fcedde19b9d4d19439fab7f3c546f5458d58790 100644 (file)
--- a/psad/signatures
+++ b/psad/signatures
@@ -77,8 +77,8 @@ alert udp $EXTERNAL_NET any -> $HOME_NET 32771 (msg:"RPC portmap listing UDP 327
  ### backdoor.rules
  alert tcp $EXTERNAL_NET any -> $HOME_NET 16959 (msg:"BACKDOOR Subseven DEFCON8 2.1 connection Attempt"; flags:S; classtype:trojan-activity; sid:107; psad_id:100027; psad_dl:2;)
  alert tcp $EXTERNAL_NET any -> $HOME_NET 27374 (msg:"BACKDOOR Subseven connection attempt"; flags:S; classtype:trojan-activity; psad_id:100207; psad_dl:2;)
-alert tcp $EXTERNAL_NET any -> $HOME_NET 12345:12346 (msg:"BACKDOOR netbus Connection Cttempt"; flags:S; reference:arachnids,401; classtype:misc-activity; psad_id:100028; psad_dl:2; psad_derived_sids:109,110;)
-alert tcp $EXTERNAL_NET any -> $HOME_NET 20034 (msg:"BACKDOOR NetBus Pro 2.0 Connection Cttempt"; flags:S; classtype:misc-activity; psad_id:100029; psad_dl:2; psad_derived_sids:115,3009;)
+alert tcp $EXTERNAL_NET any -> $HOME_NET 12345:12346 (msg:"BACKDOOR netbus Connection Attempt"; flags:S; reference:arachnids,401; classtype:misc-activity; psad_id:100028; psad_dl:2; psad_derived_sids:109,110;)
+alert tcp $EXTERNAL_NET any -> $HOME_NET 20034 (msg:"BACKDOOR NetBus Pro 2.0 Connection Attempt"; flags:S; classtype:misc-activity; psad_id:100029; psad_dl:2; psad_derived_sids:115,3009;)
  alert udp $EXTERNAL_NET any -> $HOME_NET 2140 (msg:"BACKDOOR DeepThroat 3.1 Connection attempt"; reference:mcafee,98574; reference:nessus,10053; classtype:misc-activity; psad_dsize:>1; sid:1980; psad_id:100030; psad_dl:2;)
  alert udp $HOME_NET 2140 -> $EXTERNAL_NET any (msg:"BACKDOOR DeepThroat 3.1 Server Response"; reference:arachnids,106; reference:mcafee,98574; reference:nessus,10053; classtype:misc-activity; psad_dsize:>21; sid:195; psad_id:100031; psad_dl:2;)
  alert udp $EXTERNAL_NET any -> $HOME_NET 3150 (msg:"BACKDOOR DeepThroat 3.1 Connection attempt [3150]"; reference:mcafee,98574; reference:nessus,10053; classtype:misc-activity; psad_dsize:>1; sid:1981; psad_id:100032; psad_dl:2;)
@@ -137,6 +137,7 @@ alert tcp $EXTERNAL_NET any -> $HOME_NET any (msg:"SCAN ipEye SYN scan"; flags:S
  alert tcp $EXTERNAL_NET any -> $HOME_NET 17300 (msg:"PSAD-CUSTOM Kuang2 virus communication attempt"; flags:S; reference:url,isc.sans.org/port_details.php?port=17300; classtype:trojan-activity; psad_id:100206; psad_dl:2;)
  alert udp $EXTERNAL_NET any -> $HOME_NET 1434 (msg:"PSAD-CUSTOM Slammer communication attempt"; reference:url,www.linklogger.com/UDP1434.htm; classtype:trojan-activity; psad_id:100208; psad_dl:2; psad_ip_len:404;)
  alert icmp $EXTERNAL_NET any -> $HOME_NET any (msg:"PSAD-CUSTOM Nachi worm reconnaisannce"; itype:8; icode:0; reference:url,www.cisco.com/en/US/products/sw/voicesw/ps556/products_security_notice09186a00801b143a.html; classtype:trojan-activity; psad_id:100209; psad_dl:2; psad_ip_len:92;)
+alert udp $EXTERNAL_NET any -> $HOME_NET 62201 (msg:"PSAD-CUSTOM fwknop Single Packet Authorization (SPA) packet"; reference:url,www.cipherdyne.org/fwknop; classtype:misc-activity; psad_id:100210; psad_dl:2; psad_dsize:>130;)
  
  ### misc.rules
  alert tcp $EXTERNAL_NET any -> $HOME_NET 1433 (msg:"MISC Microsoft SQL Server communication attempt"; flags:S; reference:url,www.linklogger.com/TCP1433.htm; classtype:attempted-admin; psad_id:100205; psad_dl:2;)
diff --git a/rarfiles.lst b/rarfiles.lst

index bbf6b2c2db10906d742788d760f2cfbf4379c7a3..22b5417f5d79fd7cb031d63b06c51c39aea35db0 100644 (file)
--- a/rarfiles.lst
+++ b/rarfiles.lst
@@ -51,8 +51,6 @@ readme.*
  *.com
  *.exe
  *.dll
-*.ovr
-*.ovl
  *.obj
  *.lib
  *.sys
@@ -69,19 +67,25 @@ $default
  *.wmv
  *.wma
  *.gif
+*.tif
  *.png
  *.jpg
  *.chm
+*.pdf
  *.cab
  *.7z
  *.arj
  *.ha
+*.lz
  *.lzh
  *.rar
  *.zip
  *.gz
  *.bz2
  *.xz
+*.jar
  *.fla
  *.flac
  *.ape
+*.bik
+*.mkv
diff --git a/rc2.d/S01apport b/rc2.d/S01apport

deleted file mode 120000 (symlink)

index 6706960..0000000
--- a/rc2.d/S01apport
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/apport
-\ No newline at end of file
diff --git a/rc2.d/S01console-setup.sh b/rc2.d/S01console-setup.sh

new file mode 120000 (symlink)

index 0000000..0758e04
--- /dev/null
+++ b/rc2.d/S01console-setup.sh
@@ -0,0 +1 @@
+../init.d/console-setup.sh
+\ No newline at end of file
diff --git a/rc2.d/S01devolonetsvc b/rc2.d/S01devolonetsvc

deleted file mode 120000 (symlink)

index ee9615c..0000000
--- a/rc2.d/S01devolonetsvc
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/devolonetsvc
-\ No newline at end of file
diff --git a/rc2.d/S01fancontrol b/rc2.d/S01fancontrol

deleted file mode 120000 (symlink)

index e0b7503..0000000
--- a/rc2.d/S01fancontrol
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/fancontrol
-\ No newline at end of file
diff --git a/rc2.d/S01lvm2-lvmetad b/rc2.d/S01lvm2-lvmetad

deleted file mode 120000 (symlink)

index 624df2a..0000000
--- a/rc2.d/S01lvm2-lvmetad
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lvm2-lvmetad
-\ No newline at end of file
diff --git a/rc2.d/S01lvm2-lvmpolld b/rc2.d/S01lvm2-lvmpolld

deleted file mode 120000 (symlink)

index a84782f..0000000
--- a/rc2.d/S01lvm2-lvmpolld
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lvm2-lvmpolld
-\ No newline at end of file
diff --git a/rc2.d/S01mongodb b/rc2.d/S01mongodb

deleted file mode 120000 (symlink)

index 19afd4a..0000000
--- a/rc2.d/S01mongodb
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mongodb
-\ No newline at end of file
diff --git a/rc2.d/S01psad b/rc2.d/S01psad

deleted file mode 120000 (symlink)

index 56b2943..0000000
--- a/rc2.d/S01psad
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/psad
-\ No newline at end of file
diff --git a/rc2.d/S01rsyslog b/rc2.d/S01rsyslog

deleted file mode 120000 (symlink)

index 7000c51..0000000
--- a/rc2.d/S01rsyslog
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rsyslog
-\ No newline at end of file
diff --git a/rc2.d/S01unattended-upgrades b/rc2.d/S01unattended-upgrades

deleted file mode 120000 (symlink)

index 9dd29fc..0000000
--- a/rc2.d/S01unattended-upgrades
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/unattended-upgrades
-\ No newline at end of file
diff --git a/rc2.d/S01unifi b/rc2.d/S01unifi

deleted file mode 120000 (symlink)

index 0d48639..0000000
--- a/rc2.d/S01unifi
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/unifi
-\ No newline at end of file
diff --git a/rc2.d/S01uuidd b/rc2.d/S01uuidd

deleted file mode 120000 (symlink)

index ee54bd4..0000000
--- a/rc2.d/S01uuidd
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/uuidd
-\ No newline at end of file
diff --git a/rc2.d/S02acpid b/rc2.d/S02acpid

deleted file mode 120000 (symlink)

index e15f7fe..0000000
--- a/rc2.d/S02acpid
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/acpid
-\ No newline at end of file
diff --git a/rc2.d/S02anacron b/rc2.d/S02anacron

deleted file mode 120000 (symlink)

index fa373cf..0000000
--- a/rc2.d/S02anacron
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/anacron
-\ No newline at end of file
diff --git a/rc2.d/S02apport b/rc2.d/S02apport

new file mode 120000 (symlink)

index 0000000..6706960
--- /dev/null
+++ b/rc2.d/S02apport
@@ -0,0 +1 @@
+../init.d/apport
+\ No newline at end of file
diff --git a/rc2.d/S02batmand b/rc2.d/S02batmand

deleted file mode 120000 (symlink)

index 44edf4d..0000000
--- a/rc2.d/S02batmand
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/batmand
-\ No newline at end of file
diff --git a/rc2.d/S02cron b/rc2.d/S02cron

deleted file mode 120000 (symlink)

index b7a1f29..0000000
--- a/rc2.d/S02cron
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/cron
-\ No newline at end of file
diff --git a/rc2.d/S02dbus b/rc2.d/S02dbus

deleted file mode 120000 (symlink)

index 05fdfc6..0000000
--- a/rc2.d/S02dbus
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/dbus
-\ No newline at end of file
diff --git a/rc2.d/S02devolonetsvc b/rc2.d/S02devolonetsvc

new file mode 120000 (symlink)

index 0000000..ee9615c
--- /dev/null
+++ b/rc2.d/S02devolonetsvc
@@ -0,0 +1 @@
+../init.d/devolonetsvc
+\ No newline at end of file
diff --git a/rc2.d/S02fancontrol b/rc2.d/S02fancontrol

new file mode 120000 (symlink)

index 0000000..e0b7503
--- /dev/null
+++ b/rc2.d/S02fancontrol
@@ -0,0 +1 @@
+../init.d/fancontrol
+\ No newline at end of file
diff --git a/rc2.d/S02irqbalance b/rc2.d/S02irqbalance

deleted file mode 120000 (symlink)

index 10c5342..0000000
--- a/rc2.d/S02irqbalance
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/irqbalance
-\ No newline at end of file
diff --git a/rc2.d/S02kerneloops b/rc2.d/S02kerneloops

deleted file mode 120000 (symlink)

index 328ba1d..0000000
--- a/rc2.d/S02kerneloops
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/kerneloops
-\ No newline at end of file
diff --git a/rc2.d/S02lvm2-lvmetad b/rc2.d/S02lvm2-lvmetad

new file mode 120000 (symlink)

index 0000000..624df2a
--- /dev/null
+++ b/rc2.d/S02lvm2-lvmetad
@@ -0,0 +1 @@
+../init.d/lvm2-lvmetad
+\ No newline at end of file
diff --git a/rc2.d/S02lvm2-lvmpolld b/rc2.d/S02lvm2-lvmpolld

new file mode 120000 (symlink)

index 0000000..a84782f
--- /dev/null
+++ b/rc2.d/S02lvm2-lvmpolld
@@ -0,0 +1 @@
+../init.d/lvm2-lvmpolld
+\ No newline at end of file
diff --git a/rc2.d/S02mongodb b/rc2.d/S02mongodb

new file mode 120000 (symlink)

index 0000000..19afd4a
--- /dev/null
+++ b/rc2.d/S02mongodb
@@ -0,0 +1 @@
+../init.d/mongodb
+\ No newline at end of file
diff --git a/rc2.d/S02postfix b/rc2.d/S02postfix

deleted file mode 120000 (symlink)

index 81e743c..0000000
--- a/rc2.d/S02postfix
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/postfix
-\ No newline at end of file
diff --git a/rc2.d/S02psad b/rc2.d/S02psad

new file mode 120000 (symlink)

index 0000000..56b2943
--- /dev/null
+++ b/rc2.d/S02psad
@@ -0,0 +1 @@
+../init.d/psad
+\ No newline at end of file
diff --git a/rc2.d/S02rsync b/rc2.d/S02rsync

deleted file mode 120000 (symlink)

index 3f11f90..0000000
--- a/rc2.d/S02rsync
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rsync
-\ No newline at end of file
diff --git a/rc2.d/S02rsyslog b/rc2.d/S02rsyslog

new file mode 120000 (symlink)

index 0000000..7000c51
--- /dev/null
+++ b/rc2.d/S02rsyslog
@@ -0,0 +1 @@
+../init.d/rsyslog
+\ No newline at end of file
diff --git a/rc2.d/S02speech-dispatcher b/rc2.d/S02speech-dispatcher

deleted file mode 120000 (symlink)

index ef1f482..0000000
--- a/rc2.d/S02speech-dispatcher
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/speech-dispatcher
-\ No newline at end of file
diff --git a/rc2.d/S02ssh b/rc2.d/S02ssh

deleted file mode 120000 (symlink)

index 70e14ad..0000000
--- a/rc2.d/S02ssh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ssh
-\ No newline at end of file
diff --git a/rc2.d/S02thermald b/rc2.d/S02thermald

deleted file mode 120000 (symlink)

index 0e051ba..0000000
--- a/rc2.d/S02thermald
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/thermald
-\ No newline at end of file
diff --git a/rc2.d/S02unattended-upgrades b/rc2.d/S02unattended-upgrades

new file mode 120000 (symlink)

index 0000000..9dd29fc
--- /dev/null
+++ b/rc2.d/S02unattended-upgrades
@@ -0,0 +1 @@
+../init.d/unattended-upgrades
+\ No newline at end of file
diff --git a/rc2.d/S02unifi b/rc2.d/S02unifi

new file mode 120000 (symlink)

index 0000000..0d48639
--- /dev/null
+++ b/rc2.d/S02unifi
@@ -0,0 +1 @@
+../init.d/unifi
+\ No newline at end of file
diff --git a/rc2.d/S02uuidd b/rc2.d/S02uuidd

new file mode 120000 (symlink)

index 0000000..ee54bd4
--- /dev/null
+++ b/rc2.d/S02uuidd
@@ -0,0 +1 @@
+../init.d/uuidd
+\ No newline at end of file
diff --git a/rc2.d/S02whoopsie b/rc2.d/S02whoopsie

deleted file mode 120000 (symlink)

index 90e4df7..0000000
--- a/rc2.d/S02whoopsie
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/whoopsie
-\ No newline at end of file
diff --git a/rc2.d/S03acpid b/rc2.d/S03acpid

new file mode 120000 (symlink)

index 0000000..e15f7fe
--- /dev/null
+++ b/rc2.d/S03acpid
@@ -0,0 +1 @@
+../init.d/acpid
+\ No newline at end of file
diff --git a/rc2.d/S03anacron b/rc2.d/S03anacron

new file mode 120000 (symlink)

index 0000000..fa373cf
--- /dev/null
+++ b/rc2.d/S03anacron
@@ -0,0 +1 @@
+../init.d/anacron
+\ No newline at end of file
diff --git a/rc2.d/S03avahi-daemon b/rc2.d/S03avahi-daemon

deleted file mode 120000 (symlink)

index d28b326..0000000
--- a/rc2.d/S03avahi-daemon
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/avahi-daemon
-\ No newline at end of file
diff --git a/rc2.d/S03batmand b/rc2.d/S03batmand

new file mode 120000 (symlink)

index 0000000..44edf4d
--- /dev/null
+++ b/rc2.d/S03batmand
@@ -0,0 +1 @@
+../init.d/batmand
+\ No newline at end of file
diff --git a/rc2.d/S03bluetooth b/rc2.d/S03bluetooth

deleted file mode 120000 (symlink)

index affb39f..0000000
--- a/rc2.d/S03bluetooth
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/bluetooth
-\ No newline at end of file
diff --git a/rc2.d/S03cron b/rc2.d/S03cron

new file mode 120000 (symlink)

index 0000000..b7a1f29
--- /dev/null
+++ b/rc2.d/S03cron
@@ -0,0 +1 @@
+../init.d/cron
+\ No newline at end of file
diff --git a/rc2.d/S03dbus b/rc2.d/S03dbus

new file mode 120000 (symlink)

index 0000000..05fdfc6
--- /dev/null
+++ b/rc2.d/S03dbus
@@ -0,0 +1 @@
+../init.d/dbus
+\ No newline at end of file
diff --git a/rc2.d/S03irqbalance b/rc2.d/S03irqbalance

new file mode 120000 (symlink)

index 0000000..10c5342
--- /dev/null
+++ b/rc2.d/S03irqbalance
@@ -0,0 +1 @@
+../init.d/irqbalance
+\ No newline at end of file
diff --git a/rc2.d/S03kerneloops b/rc2.d/S03kerneloops

new file mode 120000 (symlink)

index 0000000..328ba1d
--- /dev/null
+++ b/rc2.d/S03kerneloops
@@ -0,0 +1 @@
+../init.d/kerneloops
+\ No newline at end of file
diff --git a/rc2.d/S03lightdm b/rc2.d/S03lightdm

deleted file mode 120000 (symlink)

index ae17aeb..0000000
--- a/rc2.d/S03lightdm
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lightdm
-\ No newline at end of file
diff --git a/rc2.d/S03postfix b/rc2.d/S03postfix

new file mode 120000 (symlink)

index 0000000..81e743c
--- /dev/null
+++ b/rc2.d/S03postfix
@@ -0,0 +1 @@
+../init.d/postfix
+\ No newline at end of file
diff --git a/rc2.d/S03rsync b/rc2.d/S03rsync

new file mode 120000 (symlink)

index 0000000..3f11f90
--- /dev/null
+++ b/rc2.d/S03rsync
@@ -0,0 +1 @@
+../init.d/rsync
+\ No newline at end of file
diff --git a/rc2.d/S03speech-dispatcher b/rc2.d/S03speech-dispatcher

new file mode 120000 (symlink)

index 0000000..ef1f482
--- /dev/null
+++ b/rc2.d/S03speech-dispatcher
@@ -0,0 +1 @@
+../init.d/speech-dispatcher
+\ No newline at end of file
diff --git a/rc2.d/S03ssh b/rc2.d/S03ssh

new file mode 120000 (symlink)

index 0000000..70e14ad
--- /dev/null
+++ b/rc2.d/S03ssh
@@ -0,0 +1 @@
+../init.d/ssh
+\ No newline at end of file
diff --git a/rc2.d/S03thermald b/rc2.d/S03thermald

new file mode 120000 (symlink)

index 0000000..0e051ba
--- /dev/null
+++ b/rc2.d/S03thermald
@@ -0,0 +1 @@
+../init.d/thermald
+\ No newline at end of file
diff --git a/rc2.d/S03whoopsie b/rc2.d/S03whoopsie

new file mode 120000 (symlink)

index 0000000..90e4df7
--- /dev/null
+++ b/rc2.d/S03whoopsie
@@ -0,0 +1 @@
+../init.d/whoopsie
+\ No newline at end of file
diff --git a/rc2.d/S04avahi-daemon b/rc2.d/S04avahi-daemon

new file mode 120000 (symlink)

index 0000000..d28b326
--- /dev/null
+++ b/rc2.d/S04avahi-daemon
@@ -0,0 +1 @@
+../init.d/avahi-daemon
+\ No newline at end of file
diff --git a/rc2.d/S04bluetooth b/rc2.d/S04bluetooth

new file mode 120000 (symlink)

index 0000000..affb39f
--- /dev/null
+++ b/rc2.d/S04bluetooth
@@ -0,0 +1 @@
+../init.d/bluetooth
+\ No newline at end of file
diff --git a/rc2.d/S04lightdm b/rc2.d/S04lightdm

new file mode 120000 (symlink)

index 0000000..ae17aeb
--- /dev/null
+++ b/rc2.d/S04lightdm
@@ -0,0 +1 @@
+../init.d/lightdm
+\ No newline at end of file
diff --git a/rc2.d/S04openvpn b/rc2.d/S04openvpn

deleted file mode 120000 (symlink)

index 7fc299b..0000000
--- a/rc2.d/S04openvpn
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/openvpn
-\ No newline at end of file
diff --git a/rc2.d/S05cups b/rc2.d/S05cups

deleted file mode 120000 (symlink)

index 9dae5ac..0000000
--- a/rc2.d/S05cups
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/cups
-\ No newline at end of file
diff --git a/rc2.d/S05cups-browsed b/rc2.d/S05cups-browsed

deleted file mode 120000 (symlink)

index 5485fd3..0000000
--- a/rc2.d/S05cups-browsed
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/cups-browsed
-\ No newline at end of file
diff --git a/rc2.d/S05openvpn b/rc2.d/S05openvpn

new file mode 120000 (symlink)

index 0000000..7fc299b
--- /dev/null
+++ b/rc2.d/S05openvpn
@@ -0,0 +1 @@
+../init.d/openvpn
+\ No newline at end of file
diff --git a/rc2.d/S05saned b/rc2.d/S05saned

deleted file mode 120000 (symlink)

index 4c6451c..0000000
--- a/rc2.d/S05saned
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/saned
-\ No newline at end of file
diff --git a/rc2.d/S06cups b/rc2.d/S06cups

new file mode 120000 (symlink)

index 0000000..9dae5ac
--- /dev/null
+++ b/rc2.d/S06cups
@@ -0,0 +1 @@
+../init.d/cups
+\ No newline at end of file
diff --git a/rc2.d/S06cups-browsed b/rc2.d/S06cups-browsed

new file mode 120000 (symlink)

index 0000000..5485fd3
--- /dev/null
+++ b/rc2.d/S06cups-browsed
@@ -0,0 +1 @@
+../init.d/cups-browsed
+\ No newline at end of file
diff --git a/rc2.d/S06grub-common b/rc2.d/S06grub-common

deleted file mode 120000 (symlink)

index 54e0dca..0000000
--- a/rc2.d/S06grub-common
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/grub-common
-\ No newline at end of file
diff --git a/rc2.d/S06ondemand b/rc2.d/S06ondemand

deleted file mode 120000 (symlink)

index de8e234..0000000
--- a/rc2.d/S06ondemand
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ondemand
-\ No newline at end of file
diff --git a/rc2.d/S06plymouth b/rc2.d/S06plymouth

deleted file mode 120000 (symlink)

index 1bede9b..0000000
--- a/rc2.d/S06plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/plymouth
-\ No newline at end of file
diff --git a/rc2.d/S06rc.local b/rc2.d/S06rc.local

deleted file mode 120000 (symlink)

index fb4ee0a..0000000
--- a/rc2.d/S06rc.local
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rc.local
-\ No newline at end of file
diff --git a/rc2.d/S06saned b/rc2.d/S06saned

new file mode 120000 (symlink)

index 0000000..4c6451c
--- /dev/null
+++ b/rc2.d/S06saned
@@ -0,0 +1 @@
+../init.d/saned
+\ No newline at end of file
diff --git a/rc2.d/S07grub-common b/rc2.d/S07grub-common

new file mode 120000 (symlink)

index 0000000..54e0dca
--- /dev/null
+++ b/rc2.d/S07grub-common
@@ -0,0 +1 @@
+../init.d/grub-common
+\ No newline at end of file
diff --git a/rc2.d/S07ondemand b/rc2.d/S07ondemand

new file mode 120000 (symlink)

index 0000000..de8e234
--- /dev/null
+++ b/rc2.d/S07ondemand
@@ -0,0 +1 @@
+../init.d/ondemand
+\ No newline at end of file
diff --git a/rc2.d/S07plymouth b/rc2.d/S07plymouth

new file mode 120000 (symlink)

index 0000000..1bede9b
--- /dev/null
+++ b/rc2.d/S07plymouth
@@ -0,0 +1 @@
+../init.d/plymouth
+\ No newline at end of file
diff --git a/rc2.d/S07rc.local b/rc2.d/S07rc.local

new file mode 120000 (symlink)

index 0000000..fb4ee0a
--- /dev/null
+++ b/rc2.d/S07rc.local
@@ -0,0 +1 @@
+../init.d/rc.local
+\ No newline at end of file
diff --git a/rc3.d/S01apport b/rc3.d/S01apport

deleted file mode 120000 (symlink)

index 6706960..0000000
--- a/rc3.d/S01apport
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/apport
-\ No newline at end of file
diff --git a/rc3.d/S01console-setup.sh b/rc3.d/S01console-setup.sh

new file mode 120000 (symlink)

index 0000000..0758e04
--- /dev/null
+++ b/rc3.d/S01console-setup.sh
@@ -0,0 +1 @@
+../init.d/console-setup.sh
+\ No newline at end of file
diff --git a/rc3.d/S01devolonetsvc b/rc3.d/S01devolonetsvc

deleted file mode 120000 (symlink)

index ee9615c..0000000
--- a/rc3.d/S01devolonetsvc
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/devolonetsvc
-\ No newline at end of file
diff --git a/rc3.d/S01fancontrol b/rc3.d/S01fancontrol

deleted file mode 120000 (symlink)

index e0b7503..0000000
--- a/rc3.d/S01fancontrol
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/fancontrol
-\ No newline at end of file
diff --git a/rc3.d/S01lvm2-lvmetad b/rc3.d/S01lvm2-lvmetad

deleted file mode 120000 (symlink)

index 624df2a..0000000
--- a/rc3.d/S01lvm2-lvmetad
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lvm2-lvmetad
-\ No newline at end of file
diff --git a/rc3.d/S01lvm2-lvmpolld b/rc3.d/S01lvm2-lvmpolld

deleted file mode 120000 (symlink)

index a84782f..0000000
--- a/rc3.d/S01lvm2-lvmpolld
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lvm2-lvmpolld
-\ No newline at end of file
diff --git a/rc3.d/S01mongodb b/rc3.d/S01mongodb

deleted file mode 120000 (symlink)

index 19afd4a..0000000
--- a/rc3.d/S01mongodb
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mongodb
-\ No newline at end of file
diff --git a/rc3.d/S01psad b/rc3.d/S01psad

deleted file mode 120000 (symlink)

index 56b2943..0000000
--- a/rc3.d/S01psad
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/psad
-\ No newline at end of file
diff --git a/rc3.d/S01rsyslog b/rc3.d/S01rsyslog

deleted file mode 120000 (symlink)

index 7000c51..0000000
--- a/rc3.d/S01rsyslog
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rsyslog
-\ No newline at end of file
diff --git a/rc3.d/S01unattended-upgrades b/rc3.d/S01unattended-upgrades

deleted file mode 120000 (symlink)

index 9dd29fc..0000000
--- a/rc3.d/S01unattended-upgrades
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/unattended-upgrades
-\ No newline at end of file
diff --git a/rc3.d/S01unifi b/rc3.d/S01unifi

deleted file mode 120000 (symlink)

index 0d48639..0000000
--- a/rc3.d/S01unifi
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/unifi
-\ No newline at end of file
diff --git a/rc3.d/S01uuidd b/rc3.d/S01uuidd

deleted file mode 120000 (symlink)

index ee54bd4..0000000
--- a/rc3.d/S01uuidd
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/uuidd
-\ No newline at end of file
diff --git a/rc3.d/S02acpid b/rc3.d/S02acpid

deleted file mode 120000 (symlink)

index e15f7fe..0000000
--- a/rc3.d/S02acpid
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/acpid
-\ No newline at end of file
diff --git a/rc3.d/S02anacron b/rc3.d/S02anacron

deleted file mode 120000 (symlink)

index fa373cf..0000000
--- a/rc3.d/S02anacron
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/anacron
-\ No newline at end of file
diff --git a/rc3.d/S02apport b/rc3.d/S02apport

new file mode 120000 (symlink)

index 0000000..6706960
--- /dev/null
+++ b/rc3.d/S02apport
@@ -0,0 +1 @@
+../init.d/apport
+\ No newline at end of file
diff --git a/rc3.d/S02batmand b/rc3.d/S02batmand

deleted file mode 120000 (symlink)

index 44edf4d..0000000
--- a/rc3.d/S02batmand
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/batmand
-\ No newline at end of file
diff --git a/rc3.d/S02cron b/rc3.d/S02cron

deleted file mode 120000 (symlink)

index b7a1f29..0000000
--- a/rc3.d/S02cron
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/cron
-\ No newline at end of file
diff --git a/rc3.d/S02dbus b/rc3.d/S02dbus

deleted file mode 120000 (symlink)

index 05fdfc6..0000000
--- a/rc3.d/S02dbus
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/dbus
-\ No newline at end of file
diff --git a/rc3.d/S02devolonetsvc b/rc3.d/S02devolonetsvc

new file mode 120000 (symlink)

index 0000000..ee9615c
--- /dev/null
+++ b/rc3.d/S02devolonetsvc
@@ -0,0 +1 @@
+../init.d/devolonetsvc
+\ No newline at end of file
diff --git a/rc3.d/S02fancontrol b/rc3.d/S02fancontrol

new file mode 120000 (symlink)

index 0000000..e0b7503
--- /dev/null
+++ b/rc3.d/S02fancontrol
@@ -0,0 +1 @@
+../init.d/fancontrol
+\ No newline at end of file
diff --git a/rc3.d/S02irqbalance b/rc3.d/S02irqbalance

deleted file mode 120000 (symlink)

index 10c5342..0000000
--- a/rc3.d/S02irqbalance
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/irqbalance
-\ No newline at end of file
diff --git a/rc3.d/S02kerneloops b/rc3.d/S02kerneloops

deleted file mode 120000 (symlink)

index 328ba1d..0000000
--- a/rc3.d/S02kerneloops
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/kerneloops
-\ No newline at end of file
diff --git a/rc3.d/S02lvm2-lvmetad b/rc3.d/S02lvm2-lvmetad

new file mode 120000 (symlink)

index 0000000..624df2a
--- /dev/null
+++ b/rc3.d/S02lvm2-lvmetad
@@ -0,0 +1 @@
+../init.d/lvm2-lvmetad
+\ No newline at end of file
diff --git a/rc3.d/S02lvm2-lvmpolld b/rc3.d/S02lvm2-lvmpolld

new file mode 120000 (symlink)

index 0000000..a84782f
--- /dev/null
+++ b/rc3.d/S02lvm2-lvmpolld
@@ -0,0 +1 @@
+../init.d/lvm2-lvmpolld
+\ No newline at end of file
diff --git a/rc3.d/S02mongodb b/rc3.d/S02mongodb

new file mode 120000 (symlink)

index 0000000..19afd4a
--- /dev/null
+++ b/rc3.d/S02mongodb
@@ -0,0 +1 @@
+../init.d/mongodb
+\ No newline at end of file
diff --git a/rc3.d/S02postfix b/rc3.d/S02postfix

deleted file mode 120000 (symlink)

index 81e743c..0000000
--- a/rc3.d/S02postfix
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/postfix
-\ No newline at end of file
diff --git a/rc3.d/S02psad b/rc3.d/S02psad

new file mode 120000 (symlink)

index 0000000..56b2943
--- /dev/null
+++ b/rc3.d/S02psad
@@ -0,0 +1 @@
+../init.d/psad
+\ No newline at end of file
diff --git a/rc3.d/S02rsync b/rc3.d/S02rsync

deleted file mode 120000 (symlink)

index 3f11f90..0000000
--- a/rc3.d/S02rsync
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rsync
-\ No newline at end of file
diff --git a/rc3.d/S02rsyslog b/rc3.d/S02rsyslog

new file mode 120000 (symlink)

index 0000000..7000c51
--- /dev/null
+++ b/rc3.d/S02rsyslog
@@ -0,0 +1 @@
+../init.d/rsyslog
+\ No newline at end of file
diff --git a/rc3.d/S02speech-dispatcher b/rc3.d/S02speech-dispatcher

deleted file mode 120000 (symlink)

index ef1f482..0000000
--- a/rc3.d/S02speech-dispatcher
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/speech-dispatcher
-\ No newline at end of file
diff --git a/rc3.d/S02ssh b/rc3.d/S02ssh

deleted file mode 120000 (symlink)

index 70e14ad..0000000
--- a/rc3.d/S02ssh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ssh
-\ No newline at end of file
diff --git a/rc3.d/S02thermald b/rc3.d/S02thermald

deleted file mode 120000 (symlink)

index 0e051ba..0000000
--- a/rc3.d/S02thermald
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/thermald
-\ No newline at end of file
diff --git a/rc3.d/S02unattended-upgrades b/rc3.d/S02unattended-upgrades

new file mode 120000 (symlink)

index 0000000..9dd29fc
--- /dev/null
+++ b/rc3.d/S02unattended-upgrades
@@ -0,0 +1 @@
+../init.d/unattended-upgrades
+\ No newline at end of file
diff --git a/rc3.d/S02unifi b/rc3.d/S02unifi

new file mode 120000 (symlink)

index 0000000..0d48639
--- /dev/null
+++ b/rc3.d/S02unifi
@@ -0,0 +1 @@
+../init.d/unifi
+\ No newline at end of file
diff --git a/rc3.d/S02uuidd b/rc3.d/S02uuidd

new file mode 120000 (symlink)

index 0000000..ee54bd4
--- /dev/null
+++ b/rc3.d/S02uuidd
@@ -0,0 +1 @@
+../init.d/uuidd
+\ No newline at end of file
diff --git a/rc3.d/S02whoopsie b/rc3.d/S02whoopsie

deleted file mode 120000 (symlink)

index 90e4df7..0000000
--- a/rc3.d/S02whoopsie
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/whoopsie
-\ No newline at end of file
diff --git a/rc3.d/S03acpid b/rc3.d/S03acpid

new file mode 120000 (symlink)

index 0000000..e15f7fe
--- /dev/null
+++ b/rc3.d/S03acpid
@@ -0,0 +1 @@
+../init.d/acpid
+\ No newline at end of file
diff --git a/rc3.d/S03anacron b/rc3.d/S03anacron

new file mode 120000 (symlink)

index 0000000..fa373cf
--- /dev/null
+++ b/rc3.d/S03anacron
@@ -0,0 +1 @@
+../init.d/anacron
+\ No newline at end of file
diff --git a/rc3.d/S03avahi-daemon b/rc3.d/S03avahi-daemon

deleted file mode 120000 (symlink)

index d28b326..0000000
--- a/rc3.d/S03avahi-daemon
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/avahi-daemon
-\ No newline at end of file
diff --git a/rc3.d/S03batmand b/rc3.d/S03batmand

new file mode 120000 (symlink)

index 0000000..44edf4d
--- /dev/null
+++ b/rc3.d/S03batmand
@@ -0,0 +1 @@
+../init.d/batmand
+\ No newline at end of file
diff --git a/rc3.d/S03bluetooth b/rc3.d/S03bluetooth

deleted file mode 120000 (symlink)

index affb39f..0000000
--- a/rc3.d/S03bluetooth
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/bluetooth
-\ No newline at end of file
diff --git a/rc3.d/S03cron b/rc3.d/S03cron

new file mode 120000 (symlink)

index 0000000..b7a1f29
--- /dev/null
+++ b/rc3.d/S03cron
@@ -0,0 +1 @@
+../init.d/cron
+\ No newline at end of file
diff --git a/rc3.d/S03dbus b/rc3.d/S03dbus

new file mode 120000 (symlink)

index 0000000..05fdfc6
--- /dev/null
+++ b/rc3.d/S03dbus
@@ -0,0 +1 @@
+../init.d/dbus
+\ No newline at end of file
diff --git a/rc3.d/S03irqbalance b/rc3.d/S03irqbalance

new file mode 120000 (symlink)

index 0000000..10c5342
--- /dev/null
+++ b/rc3.d/S03irqbalance
@@ -0,0 +1 @@
+../init.d/irqbalance
+\ No newline at end of file
diff --git a/rc3.d/S03kerneloops b/rc3.d/S03kerneloops

new file mode 120000 (symlink)

index 0000000..328ba1d
--- /dev/null
+++ b/rc3.d/S03kerneloops
@@ -0,0 +1 @@
+../init.d/kerneloops
+\ No newline at end of file
diff --git a/rc3.d/S03lightdm b/rc3.d/S03lightdm

deleted file mode 120000 (symlink)

index ae17aeb..0000000
--- a/rc3.d/S03lightdm
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lightdm
-\ No newline at end of file
diff --git a/rc3.d/S03postfix b/rc3.d/S03postfix

new file mode 120000 (symlink)

index 0000000..81e743c
--- /dev/null
+++ b/rc3.d/S03postfix
@@ -0,0 +1 @@
+../init.d/postfix
+\ No newline at end of file
diff --git a/rc3.d/S03rsync b/rc3.d/S03rsync

new file mode 120000 (symlink)

index 0000000..3f11f90
--- /dev/null
+++ b/rc3.d/S03rsync
@@ -0,0 +1 @@
+../init.d/rsync
+\ No newline at end of file
diff --git a/rc3.d/S03speech-dispatcher b/rc3.d/S03speech-dispatcher

new file mode 120000 (symlink)

index 0000000..ef1f482
--- /dev/null
+++ b/rc3.d/S03speech-dispatcher
@@ -0,0 +1 @@
+../init.d/speech-dispatcher
+\ No newline at end of file
diff --git a/rc3.d/S03ssh b/rc3.d/S03ssh

new file mode 120000 (symlink)

index 0000000..70e14ad
--- /dev/null
+++ b/rc3.d/S03ssh
@@ -0,0 +1 @@
+../init.d/ssh
+\ No newline at end of file
diff --git a/rc3.d/S03thermald b/rc3.d/S03thermald

new file mode 120000 (symlink)

index 0000000..0e051ba
--- /dev/null
+++ b/rc3.d/S03thermald
@@ -0,0 +1 @@
+../init.d/thermald
+\ No newline at end of file
diff --git a/rc3.d/S03whoopsie b/rc3.d/S03whoopsie

new file mode 120000 (symlink)

index 0000000..90e4df7
--- /dev/null
+++ b/rc3.d/S03whoopsie
@@ -0,0 +1 @@
+../init.d/whoopsie
+\ No newline at end of file
diff --git a/rc3.d/S04avahi-daemon b/rc3.d/S04avahi-daemon

new file mode 120000 (symlink)

index 0000000..d28b326
--- /dev/null
+++ b/rc3.d/S04avahi-daemon
@@ -0,0 +1 @@
+../init.d/avahi-daemon
+\ No newline at end of file
diff --git a/rc3.d/S04bluetooth b/rc3.d/S04bluetooth

new file mode 120000 (symlink)

index 0000000..affb39f
--- /dev/null
+++ b/rc3.d/S04bluetooth
@@ -0,0 +1 @@
+../init.d/bluetooth
+\ No newline at end of file
diff --git a/rc3.d/S04lightdm b/rc3.d/S04lightdm

new file mode 120000 (symlink)

index 0000000..ae17aeb
--- /dev/null
+++ b/rc3.d/S04lightdm
@@ -0,0 +1 @@
+../init.d/lightdm
+\ No newline at end of file
diff --git a/rc3.d/S04openvpn b/rc3.d/S04openvpn

deleted file mode 120000 (symlink)

index 7fc299b..0000000
--- a/rc3.d/S04openvpn
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/openvpn
-\ No newline at end of file
diff --git a/rc3.d/S05cups b/rc3.d/S05cups

deleted file mode 120000 (symlink)

index 9dae5ac..0000000
--- a/rc3.d/S05cups
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/cups
-\ No newline at end of file
diff --git a/rc3.d/S05cups-browsed b/rc3.d/S05cups-browsed

deleted file mode 120000 (symlink)

index 5485fd3..0000000
--- a/rc3.d/S05cups-browsed
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/cups-browsed
-\ No newline at end of file
diff --git a/rc3.d/S05openvpn b/rc3.d/S05openvpn

new file mode 120000 (symlink)

index 0000000..7fc299b
--- /dev/null
+++ b/rc3.d/S05openvpn
@@ -0,0 +1 @@
+../init.d/openvpn
+\ No newline at end of file
diff --git a/rc3.d/S05saned b/rc3.d/S05saned

deleted file mode 120000 (symlink)

index 4c6451c..0000000
--- a/rc3.d/S05saned
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/saned
-\ No newline at end of file
diff --git a/rc3.d/S06cups b/rc3.d/S06cups

new file mode 120000 (symlink)

index 0000000..9dae5ac
--- /dev/null
+++ b/rc3.d/S06cups
@@ -0,0 +1 @@
+../init.d/cups
+\ No newline at end of file
diff --git a/rc3.d/S06cups-browsed b/rc3.d/S06cups-browsed

new file mode 120000 (symlink)

index 0000000..5485fd3
--- /dev/null
+++ b/rc3.d/S06cups-browsed
@@ -0,0 +1 @@
+../init.d/cups-browsed
+\ No newline at end of file
diff --git a/rc3.d/S06grub-common b/rc3.d/S06grub-common

deleted file mode 120000 (symlink)

index 54e0dca..0000000
--- a/rc3.d/S06grub-common
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/grub-common
-\ No newline at end of file
diff --git a/rc3.d/S06ondemand b/rc3.d/S06ondemand

deleted file mode 120000 (symlink)

index de8e234..0000000
--- a/rc3.d/S06ondemand
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ondemand
-\ No newline at end of file
diff --git a/rc3.d/S06plymouth b/rc3.d/S06plymouth

deleted file mode 120000 (symlink)

index 1bede9b..0000000
--- a/rc3.d/S06plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/plymouth
-\ No newline at end of file
diff --git a/rc3.d/S06rc.local b/rc3.d/S06rc.local

deleted file mode 120000 (symlink)

index fb4ee0a..0000000
--- a/rc3.d/S06rc.local
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rc.local
-\ No newline at end of file
diff --git a/rc3.d/S06saned b/rc3.d/S06saned

new file mode 120000 (symlink)

index 0000000..4c6451c
--- /dev/null
+++ b/rc3.d/S06saned
@@ -0,0 +1 @@
+../init.d/saned
+\ No newline at end of file
diff --git a/rc3.d/S07grub-common b/rc3.d/S07grub-common

new file mode 120000 (symlink)

index 0000000..54e0dca
--- /dev/null
+++ b/rc3.d/S07grub-common
@@ -0,0 +1 @@
+../init.d/grub-common
+\ No newline at end of file
diff --git a/rc3.d/S07ondemand b/rc3.d/S07ondemand

new file mode 120000 (symlink)

index 0000000..de8e234
--- /dev/null
+++ b/rc3.d/S07ondemand
@@ -0,0 +1 @@
+../init.d/ondemand
+\ No newline at end of file
diff --git a/rc3.d/S07plymouth b/rc3.d/S07plymouth

new file mode 120000 (symlink)

index 0000000..1bede9b
--- /dev/null
+++ b/rc3.d/S07plymouth
@@ -0,0 +1 @@
+../init.d/plymouth
+\ No newline at end of file
diff --git a/rc3.d/S07rc.local b/rc3.d/S07rc.local

new file mode 120000 (symlink)

index 0000000..fb4ee0a
--- /dev/null
+++ b/rc3.d/S07rc.local
@@ -0,0 +1 @@
+../init.d/rc.local
+\ No newline at end of file
diff --git a/rc4.d/S01apport b/rc4.d/S01apport

deleted file mode 120000 (symlink)

index 6706960..0000000
--- a/rc4.d/S01apport
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/apport
-\ No newline at end of file
diff --git a/rc4.d/S01console-setup.sh b/rc4.d/S01console-setup.sh

new file mode 120000 (symlink)

index 0000000..0758e04
--- /dev/null
+++ b/rc4.d/S01console-setup.sh
@@ -0,0 +1 @@
+../init.d/console-setup.sh
+\ No newline at end of file
diff --git a/rc4.d/S01devolonetsvc b/rc4.d/S01devolonetsvc

deleted file mode 120000 (symlink)

index ee9615c..0000000
--- a/rc4.d/S01devolonetsvc
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/devolonetsvc
-\ No newline at end of file
diff --git a/rc4.d/S01fancontrol b/rc4.d/S01fancontrol

deleted file mode 120000 (symlink)

index e0b7503..0000000
--- a/rc4.d/S01fancontrol
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/fancontrol
-\ No newline at end of file
diff --git a/rc4.d/S01lvm2-lvmetad b/rc4.d/S01lvm2-lvmetad

deleted file mode 120000 (symlink)

index 624df2a..0000000
--- a/rc4.d/S01lvm2-lvmetad
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lvm2-lvmetad
-\ No newline at end of file
diff --git a/rc4.d/S01lvm2-lvmpolld b/rc4.d/S01lvm2-lvmpolld

deleted file mode 120000 (symlink)

index a84782f..0000000
--- a/rc4.d/S01lvm2-lvmpolld
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lvm2-lvmpolld
-\ No newline at end of file
diff --git a/rc4.d/S01mongodb b/rc4.d/S01mongodb

deleted file mode 120000 (symlink)

index 19afd4a..0000000
--- a/rc4.d/S01mongodb
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mongodb
-\ No newline at end of file
diff --git a/rc4.d/S01psad b/rc4.d/S01psad

deleted file mode 120000 (symlink)

index 56b2943..0000000
--- a/rc4.d/S01psad
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/psad
-\ No newline at end of file
diff --git a/rc4.d/S01rsyslog b/rc4.d/S01rsyslog

deleted file mode 120000 (symlink)

index 7000c51..0000000
--- a/rc4.d/S01rsyslog
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rsyslog
-\ No newline at end of file
diff --git a/rc4.d/S01unattended-upgrades b/rc4.d/S01unattended-upgrades

deleted file mode 120000 (symlink)

index 9dd29fc..0000000
--- a/rc4.d/S01unattended-upgrades
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/unattended-upgrades
-\ No newline at end of file
diff --git a/rc4.d/S01unifi b/rc4.d/S01unifi

deleted file mode 120000 (symlink)

index 0d48639..0000000
--- a/rc4.d/S01unifi
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/unifi
-\ No newline at end of file
diff --git a/rc4.d/S01uuidd b/rc4.d/S01uuidd

deleted file mode 120000 (symlink)

index ee54bd4..0000000
--- a/rc4.d/S01uuidd
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/uuidd
-\ No newline at end of file
diff --git a/rc4.d/S02acpid b/rc4.d/S02acpid

deleted file mode 120000 (symlink)

index e15f7fe..0000000
--- a/rc4.d/S02acpid
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/acpid
-\ No newline at end of file
diff --git a/rc4.d/S02anacron b/rc4.d/S02anacron

deleted file mode 120000 (symlink)

index fa373cf..0000000
--- a/rc4.d/S02anacron
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/anacron
-\ No newline at end of file
diff --git a/rc4.d/S02apport b/rc4.d/S02apport

new file mode 120000 (symlink)

index 0000000..6706960
--- /dev/null
+++ b/rc4.d/S02apport
@@ -0,0 +1 @@
+../init.d/apport
+\ No newline at end of file
diff --git a/rc4.d/S02batmand b/rc4.d/S02batmand

deleted file mode 120000 (symlink)

index 44edf4d..0000000
--- a/rc4.d/S02batmand
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/batmand
-\ No newline at end of file
diff --git a/rc4.d/S02cron b/rc4.d/S02cron

deleted file mode 120000 (symlink)

index b7a1f29..0000000
--- a/rc4.d/S02cron
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/cron
-\ No newline at end of file
diff --git a/rc4.d/S02dbus b/rc4.d/S02dbus

deleted file mode 120000 (symlink)

index 05fdfc6..0000000
--- a/rc4.d/S02dbus
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/dbus
-\ No newline at end of file
diff --git a/rc4.d/S02devolonetsvc b/rc4.d/S02devolonetsvc

new file mode 120000 (symlink)

index 0000000..ee9615c
--- /dev/null
+++ b/rc4.d/S02devolonetsvc
@@ -0,0 +1 @@
+../init.d/devolonetsvc
+\ No newline at end of file
diff --git a/rc4.d/S02fancontrol b/rc4.d/S02fancontrol

new file mode 120000 (symlink)

index 0000000..e0b7503
--- /dev/null
+++ b/rc4.d/S02fancontrol
@@ -0,0 +1 @@
+../init.d/fancontrol
+\ No newline at end of file
diff --git a/rc4.d/S02irqbalance b/rc4.d/S02irqbalance

deleted file mode 120000 (symlink)

index 10c5342..0000000
--- a/rc4.d/S02irqbalance
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/irqbalance
-\ No newline at end of file
diff --git a/rc4.d/S02kerneloops b/rc4.d/S02kerneloops

deleted file mode 120000 (symlink)

index 328ba1d..0000000
--- a/rc4.d/S02kerneloops
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/kerneloops
-\ No newline at end of file
diff --git a/rc4.d/S02lvm2-lvmetad b/rc4.d/S02lvm2-lvmetad

new file mode 120000 (symlink)

index 0000000..624df2a
--- /dev/null
+++ b/rc4.d/S02lvm2-lvmetad
@@ -0,0 +1 @@
+../init.d/lvm2-lvmetad
+\ No newline at end of file
diff --git a/rc4.d/S02lvm2-lvmpolld b/rc4.d/S02lvm2-lvmpolld

new file mode 120000 (symlink)

index 0000000..a84782f
--- /dev/null
+++ b/rc4.d/S02lvm2-lvmpolld
@@ -0,0 +1 @@
+../init.d/lvm2-lvmpolld
+\ No newline at end of file
diff --git a/rc4.d/S02mongodb b/rc4.d/S02mongodb

new file mode 120000 (symlink)

index 0000000..19afd4a
--- /dev/null
+++ b/rc4.d/S02mongodb
@@ -0,0 +1 @@
+../init.d/mongodb
+\ No newline at end of file
diff --git a/rc4.d/S02postfix b/rc4.d/S02postfix

deleted file mode 120000 (symlink)

index 81e743c..0000000
--- a/rc4.d/S02postfix
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/postfix
-\ No newline at end of file
diff --git a/rc4.d/S02psad b/rc4.d/S02psad

new file mode 120000 (symlink)

index 0000000..56b2943
--- /dev/null
+++ b/rc4.d/S02psad
@@ -0,0 +1 @@
+../init.d/psad
+\ No newline at end of file
diff --git a/rc4.d/S02rsync b/rc4.d/S02rsync

deleted file mode 120000 (symlink)

index 3f11f90..0000000
--- a/rc4.d/S02rsync
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rsync
-\ No newline at end of file
diff --git a/rc4.d/S02rsyslog b/rc4.d/S02rsyslog

new file mode 120000 (symlink)

index 0000000..7000c51
--- /dev/null
+++ b/rc4.d/S02rsyslog
@@ -0,0 +1 @@
+../init.d/rsyslog
+\ No newline at end of file
diff --git a/rc4.d/S02speech-dispatcher b/rc4.d/S02speech-dispatcher

deleted file mode 120000 (symlink)

index ef1f482..0000000
--- a/rc4.d/S02speech-dispatcher
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/speech-dispatcher
-\ No newline at end of file
diff --git a/rc4.d/S02ssh b/rc4.d/S02ssh

deleted file mode 120000 (symlink)

index 70e14ad..0000000
--- a/rc4.d/S02ssh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ssh
-\ No newline at end of file
diff --git a/rc4.d/S02thermald b/rc4.d/S02thermald

deleted file mode 120000 (symlink)

index 0e051ba..0000000
--- a/rc4.d/S02thermald
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/thermald
-\ No newline at end of file
diff --git a/rc4.d/S02unattended-upgrades b/rc4.d/S02unattended-upgrades

new file mode 120000 (symlink)

index 0000000..9dd29fc
--- /dev/null
+++ b/rc4.d/S02unattended-upgrades
@@ -0,0 +1 @@
+../init.d/unattended-upgrades
+\ No newline at end of file
diff --git a/rc4.d/S02unifi b/rc4.d/S02unifi

new file mode 120000 (symlink)

index 0000000..0d48639
--- /dev/null
+++ b/rc4.d/S02unifi
@@ -0,0 +1 @@
+../init.d/unifi
+\ No newline at end of file
diff --git a/rc4.d/S02uuidd b/rc4.d/S02uuidd

new file mode 120000 (symlink)

index 0000000..ee54bd4
--- /dev/null
+++ b/rc4.d/S02uuidd
@@ -0,0 +1 @@
+../init.d/uuidd
+\ No newline at end of file
diff --git a/rc4.d/S02whoopsie b/rc4.d/S02whoopsie

deleted file mode 120000 (symlink)

index 90e4df7..0000000
--- a/rc4.d/S02whoopsie
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/whoopsie
-\ No newline at end of file
diff --git a/rc4.d/S03acpid b/rc4.d/S03acpid

new file mode 120000 (symlink)

index 0000000..e15f7fe
--- /dev/null
+++ b/rc4.d/S03acpid
@@ -0,0 +1 @@
+../init.d/acpid
+\ No newline at end of file
diff --git a/rc4.d/S03anacron b/rc4.d/S03anacron

new file mode 120000 (symlink)

index 0000000..fa373cf
--- /dev/null
+++ b/rc4.d/S03anacron
@@ -0,0 +1 @@
+../init.d/anacron
+\ No newline at end of file
diff --git a/rc4.d/S03avahi-daemon b/rc4.d/S03avahi-daemon

deleted file mode 120000 (symlink)

index d28b326..0000000
--- a/rc4.d/S03avahi-daemon
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/avahi-daemon
-\ No newline at end of file
diff --git a/rc4.d/S03batmand b/rc4.d/S03batmand

new file mode 120000 (symlink)

index 0000000..44edf4d
--- /dev/null
+++ b/rc4.d/S03batmand
@@ -0,0 +1 @@
+../init.d/batmand
+\ No newline at end of file
diff --git a/rc4.d/S03bluetooth b/rc4.d/S03bluetooth

deleted file mode 120000 (symlink)

index affb39f..0000000
--- a/rc4.d/S03bluetooth
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/bluetooth
-\ No newline at end of file
diff --git a/rc4.d/S03cron b/rc4.d/S03cron

new file mode 120000 (symlink)

index 0000000..b7a1f29
--- /dev/null
+++ b/rc4.d/S03cron
@@ -0,0 +1 @@
+../init.d/cron
+\ No newline at end of file
diff --git a/rc4.d/S03dbus b/rc4.d/S03dbus

new file mode 120000 (symlink)

index 0000000..05fdfc6
--- /dev/null
+++ b/rc4.d/S03dbus
@@ -0,0 +1 @@
+../init.d/dbus
+\ No newline at end of file
diff --git a/rc4.d/S03irqbalance b/rc4.d/S03irqbalance

new file mode 120000 (symlink)

index 0000000..10c5342
--- /dev/null
+++ b/rc4.d/S03irqbalance
@@ -0,0 +1 @@
+../init.d/irqbalance
+\ No newline at end of file
diff --git a/rc4.d/S03kerneloops b/rc4.d/S03kerneloops

new file mode 120000 (symlink)

index 0000000..328ba1d
--- /dev/null
+++ b/rc4.d/S03kerneloops
@@ -0,0 +1 @@
+../init.d/kerneloops
+\ No newline at end of file
diff --git a/rc4.d/S03lightdm b/rc4.d/S03lightdm

deleted file mode 120000 (symlink)

index ae17aeb..0000000
--- a/rc4.d/S03lightdm
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lightdm
-\ No newline at end of file
diff --git a/rc4.d/S03postfix b/rc4.d/S03postfix

new file mode 120000 (symlink)

index 0000000..81e743c
--- /dev/null
+++ b/rc4.d/S03postfix
@@ -0,0 +1 @@
+../init.d/postfix
+\ No newline at end of file
diff --git a/rc4.d/S03rsync b/rc4.d/S03rsync

new file mode 120000 (symlink)

index 0000000..3f11f90
--- /dev/null
+++ b/rc4.d/S03rsync
@@ -0,0 +1 @@
+../init.d/rsync
+\ No newline at end of file
diff --git a/rc4.d/S03speech-dispatcher b/rc4.d/S03speech-dispatcher

new file mode 120000 (symlink)

index 0000000..ef1f482
--- /dev/null
+++ b/rc4.d/S03speech-dispatcher
@@ -0,0 +1 @@
+../init.d/speech-dispatcher
+\ No newline at end of file
diff --git a/rc4.d/S03ssh b/rc4.d/S03ssh

new file mode 120000 (symlink)

index 0000000..70e14ad
--- /dev/null
+++ b/rc4.d/S03ssh
@@ -0,0 +1 @@
+../init.d/ssh
+\ No newline at end of file
diff --git a/rc4.d/S03thermald b/rc4.d/S03thermald

new file mode 120000 (symlink)

index 0000000..0e051ba
--- /dev/null
+++ b/rc4.d/S03thermald
@@ -0,0 +1 @@
+../init.d/thermald
+\ No newline at end of file
diff --git a/rc4.d/S03whoopsie b/rc4.d/S03whoopsie

new file mode 120000 (symlink)

index 0000000..90e4df7
--- /dev/null
+++ b/rc4.d/S03whoopsie
@@ -0,0 +1 @@
+../init.d/whoopsie
+\ No newline at end of file
diff --git a/rc4.d/S04avahi-daemon b/rc4.d/S04avahi-daemon

new file mode 120000 (symlink)

index 0000000..d28b326
--- /dev/null
+++ b/rc4.d/S04avahi-daemon
@@ -0,0 +1 @@
+../init.d/avahi-daemon
+\ No newline at end of file
diff --git a/rc4.d/S04bluetooth b/rc4.d/S04bluetooth

new file mode 120000 (symlink)

index 0000000..affb39f
--- /dev/null
+++ b/rc4.d/S04bluetooth
@@ -0,0 +1 @@
+../init.d/bluetooth
+\ No newline at end of file
diff --git a/rc4.d/S04lightdm b/rc4.d/S04lightdm

new file mode 120000 (symlink)

index 0000000..ae17aeb
--- /dev/null
+++ b/rc4.d/S04lightdm
@@ -0,0 +1 @@
+../init.d/lightdm
+\ No newline at end of file
diff --git a/rc4.d/S04openvpn b/rc4.d/S04openvpn

deleted file mode 120000 (symlink)

index 7fc299b..0000000
--- a/rc4.d/S04openvpn
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/openvpn
-\ No newline at end of file
diff --git a/rc4.d/S05cups b/rc4.d/S05cups

deleted file mode 120000 (symlink)

index 9dae5ac..0000000
--- a/rc4.d/S05cups
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/cups
-\ No newline at end of file
diff --git a/rc4.d/S05cups-browsed b/rc4.d/S05cups-browsed

deleted file mode 120000 (symlink)

index 5485fd3..0000000
--- a/rc4.d/S05cups-browsed
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/cups-browsed
-\ No newline at end of file
diff --git a/rc4.d/S05openvpn b/rc4.d/S05openvpn

new file mode 120000 (symlink)

index 0000000..7fc299b
--- /dev/null
+++ b/rc4.d/S05openvpn
@@ -0,0 +1 @@
+../init.d/openvpn
+\ No newline at end of file
diff --git a/rc4.d/S05saned b/rc4.d/S05saned

deleted file mode 120000 (symlink)

index 4c6451c..0000000
--- a/rc4.d/S05saned
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/saned
-\ No newline at end of file
diff --git a/rc4.d/S06cups b/rc4.d/S06cups

new file mode 120000 (symlink)

index 0000000..9dae5ac
--- /dev/null
+++ b/rc4.d/S06cups
@@ -0,0 +1 @@
+../init.d/cups
+\ No newline at end of file
diff --git a/rc4.d/S06cups-browsed b/rc4.d/S06cups-browsed

new file mode 120000 (symlink)

index 0000000..5485fd3
--- /dev/null
+++ b/rc4.d/S06cups-browsed
@@ -0,0 +1 @@
+../init.d/cups-browsed
+\ No newline at end of file
diff --git a/rc4.d/S06grub-common b/rc4.d/S06grub-common

deleted file mode 120000 (symlink)

index 54e0dca..0000000
--- a/rc4.d/S06grub-common
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/grub-common
-\ No newline at end of file
diff --git a/rc4.d/S06ondemand b/rc4.d/S06ondemand

deleted file mode 120000 (symlink)

index de8e234..0000000
--- a/rc4.d/S06ondemand
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ondemand
-\ No newline at end of file
diff --git a/rc4.d/S06plymouth b/rc4.d/S06plymouth

deleted file mode 120000 (symlink)

index 1bede9b..0000000
--- a/rc4.d/S06plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/plymouth
-\ No newline at end of file
diff --git a/rc4.d/S06rc.local b/rc4.d/S06rc.local

deleted file mode 120000 (symlink)

index fb4ee0a..0000000
--- a/rc4.d/S06rc.local
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rc.local
-\ No newline at end of file
diff --git a/rc4.d/S06saned b/rc4.d/S06saned

new file mode 120000 (symlink)

index 0000000..4c6451c
--- /dev/null
+++ b/rc4.d/S06saned
@@ -0,0 +1 @@
+../init.d/saned
+\ No newline at end of file
diff --git a/rc4.d/S07grub-common b/rc4.d/S07grub-common

new file mode 120000 (symlink)

index 0000000..54e0dca
--- /dev/null
+++ b/rc4.d/S07grub-common
@@ -0,0 +1 @@
+../init.d/grub-common
+\ No newline at end of file
diff --git a/rc4.d/S07ondemand b/rc4.d/S07ondemand

new file mode 120000 (symlink)

index 0000000..de8e234
--- /dev/null
+++ b/rc4.d/S07ondemand
@@ -0,0 +1 @@
+../init.d/ondemand
+\ No newline at end of file
diff --git a/rc4.d/S07plymouth b/rc4.d/S07plymouth

new file mode 120000 (symlink)

index 0000000..1bede9b
--- /dev/null
+++ b/rc4.d/S07plymouth
@@ -0,0 +1 @@
+../init.d/plymouth
+\ No newline at end of file
diff --git a/rc4.d/S07rc.local b/rc4.d/S07rc.local

new file mode 120000 (symlink)

index 0000000..fb4ee0a
--- /dev/null
+++ b/rc4.d/S07rc.local
@@ -0,0 +1 @@
+../init.d/rc.local
+\ No newline at end of file
diff --git a/rc5.d/S01apport b/rc5.d/S01apport

deleted file mode 120000 (symlink)

index 6706960..0000000
--- a/rc5.d/S01apport
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/apport
-\ No newline at end of file
diff --git a/rc5.d/S01console-setup.sh b/rc5.d/S01console-setup.sh

new file mode 120000 (symlink)

index 0000000..0758e04
--- /dev/null
+++ b/rc5.d/S01console-setup.sh
@@ -0,0 +1 @@
+../init.d/console-setup.sh
+\ No newline at end of file
diff --git a/rc5.d/S01devolonetsvc b/rc5.d/S01devolonetsvc

deleted file mode 120000 (symlink)

index ee9615c..0000000
--- a/rc5.d/S01devolonetsvc
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/devolonetsvc
-\ No newline at end of file
diff --git a/rc5.d/S01fancontrol b/rc5.d/S01fancontrol

deleted file mode 120000 (symlink)

index e0b7503..0000000
--- a/rc5.d/S01fancontrol
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/fancontrol
-\ No newline at end of file
diff --git a/rc5.d/S01lvm2-lvmetad b/rc5.d/S01lvm2-lvmetad

deleted file mode 120000 (symlink)

index 624df2a..0000000
--- a/rc5.d/S01lvm2-lvmetad
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lvm2-lvmetad
-\ No newline at end of file
diff --git a/rc5.d/S01lvm2-lvmpolld b/rc5.d/S01lvm2-lvmpolld

deleted file mode 120000 (symlink)

index a84782f..0000000
--- a/rc5.d/S01lvm2-lvmpolld
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lvm2-lvmpolld
-\ No newline at end of file
diff --git a/rc5.d/S01mongodb b/rc5.d/S01mongodb

deleted file mode 120000 (symlink)

index 19afd4a..0000000
--- a/rc5.d/S01mongodb
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mongodb
-\ No newline at end of file
diff --git a/rc5.d/S01psad b/rc5.d/S01psad

deleted file mode 120000 (symlink)

index 56b2943..0000000
--- a/rc5.d/S01psad
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/psad
-\ No newline at end of file
diff --git a/rc5.d/S01rsyslog b/rc5.d/S01rsyslog

deleted file mode 120000 (symlink)

index 7000c51..0000000
--- a/rc5.d/S01rsyslog
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rsyslog
-\ No newline at end of file
diff --git a/rc5.d/S01unattended-upgrades b/rc5.d/S01unattended-upgrades

deleted file mode 120000 (symlink)

index 9dd29fc..0000000
--- a/rc5.d/S01unattended-upgrades
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/unattended-upgrades
-\ No newline at end of file
diff --git a/rc5.d/S01unifi b/rc5.d/S01unifi

deleted file mode 120000 (symlink)

index 0d48639..0000000
--- a/rc5.d/S01unifi
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/unifi
-\ No newline at end of file
diff --git a/rc5.d/S01uuidd b/rc5.d/S01uuidd

deleted file mode 120000 (symlink)

index ee54bd4..0000000
--- a/rc5.d/S01uuidd
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/uuidd
-\ No newline at end of file
diff --git a/rc5.d/S02acpid b/rc5.d/S02acpid

deleted file mode 120000 (symlink)

index e15f7fe..0000000
--- a/rc5.d/S02acpid
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/acpid
-\ No newline at end of file
diff --git a/rc5.d/S02anacron b/rc5.d/S02anacron

deleted file mode 120000 (symlink)

index fa373cf..0000000
--- a/rc5.d/S02anacron
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/anacron
-\ No newline at end of file
diff --git a/rc5.d/S02apport b/rc5.d/S02apport

new file mode 120000 (symlink)

index 0000000..6706960
--- /dev/null
+++ b/rc5.d/S02apport
@@ -0,0 +1 @@
+../init.d/apport
+\ No newline at end of file
diff --git a/rc5.d/S02batmand b/rc5.d/S02batmand

deleted file mode 120000 (symlink)

index 44edf4d..0000000
--- a/rc5.d/S02batmand
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/batmand
-\ No newline at end of file
diff --git a/rc5.d/S02cron b/rc5.d/S02cron

deleted file mode 120000 (symlink)

index b7a1f29..0000000
--- a/rc5.d/S02cron
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/cron
-\ No newline at end of file
diff --git a/rc5.d/S02dbus b/rc5.d/S02dbus

deleted file mode 120000 (symlink)

index 05fdfc6..0000000
--- a/rc5.d/S02dbus
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/dbus
-\ No newline at end of file
diff --git a/rc5.d/S02devolonetsvc b/rc5.d/S02devolonetsvc

new file mode 120000 (symlink)

index 0000000..ee9615c
--- /dev/null
+++ b/rc5.d/S02devolonetsvc
@@ -0,0 +1 @@
+../init.d/devolonetsvc
+\ No newline at end of file
diff --git a/rc5.d/S02fancontrol b/rc5.d/S02fancontrol

new file mode 120000 (symlink)

index 0000000..e0b7503
--- /dev/null
+++ b/rc5.d/S02fancontrol
@@ -0,0 +1 @@
+../init.d/fancontrol
+\ No newline at end of file
diff --git a/rc5.d/S02irqbalance b/rc5.d/S02irqbalance

deleted file mode 120000 (symlink)

index 10c5342..0000000
--- a/rc5.d/S02irqbalance
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/irqbalance
-\ No newline at end of file
diff --git a/rc5.d/S02kerneloops b/rc5.d/S02kerneloops

deleted file mode 120000 (symlink)

index 328ba1d..0000000
--- a/rc5.d/S02kerneloops
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/kerneloops
-\ No newline at end of file
diff --git a/rc5.d/S02lvm2-lvmetad b/rc5.d/S02lvm2-lvmetad

new file mode 120000 (symlink)

index 0000000..624df2a
--- /dev/null
+++ b/rc5.d/S02lvm2-lvmetad
@@ -0,0 +1 @@
+../init.d/lvm2-lvmetad
+\ No newline at end of file
diff --git a/rc5.d/S02lvm2-lvmpolld b/rc5.d/S02lvm2-lvmpolld

new file mode 120000 (symlink)

index 0000000..a84782f
--- /dev/null
+++ b/rc5.d/S02lvm2-lvmpolld
@@ -0,0 +1 @@
+../init.d/lvm2-lvmpolld
+\ No newline at end of file
diff --git a/rc5.d/S02mongodb b/rc5.d/S02mongodb

new file mode 120000 (symlink)

index 0000000..19afd4a
--- /dev/null
+++ b/rc5.d/S02mongodb
@@ -0,0 +1 @@
+../init.d/mongodb
+\ No newline at end of file
diff --git a/rc5.d/S02postfix b/rc5.d/S02postfix

deleted file mode 120000 (symlink)

index 81e743c..0000000
--- a/rc5.d/S02postfix
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/postfix
-\ No newline at end of file
diff --git a/rc5.d/S02psad b/rc5.d/S02psad

new file mode 120000 (symlink)

index 0000000..56b2943
--- /dev/null
+++ b/rc5.d/S02psad
@@ -0,0 +1 @@
+../init.d/psad
+\ No newline at end of file
diff --git a/rc5.d/S02rsync b/rc5.d/S02rsync

deleted file mode 120000 (symlink)

index 3f11f90..0000000
--- a/rc5.d/S02rsync
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rsync
-\ No newline at end of file
diff --git a/rc5.d/S02rsyslog b/rc5.d/S02rsyslog

new file mode 120000 (symlink)

index 0000000..7000c51
--- /dev/null
+++ b/rc5.d/S02rsyslog
@@ -0,0 +1 @@
+../init.d/rsyslog
+\ No newline at end of file
diff --git a/rc5.d/S02speech-dispatcher b/rc5.d/S02speech-dispatcher

deleted file mode 120000 (symlink)

index ef1f482..0000000
--- a/rc5.d/S02speech-dispatcher
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/speech-dispatcher
-\ No newline at end of file
diff --git a/rc5.d/S02ssh b/rc5.d/S02ssh

deleted file mode 120000 (symlink)

index 70e14ad..0000000
--- a/rc5.d/S02ssh
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ssh
-\ No newline at end of file
diff --git a/rc5.d/S02thermald b/rc5.d/S02thermald

deleted file mode 120000 (symlink)

index 0e051ba..0000000
--- a/rc5.d/S02thermald
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/thermald
-\ No newline at end of file
diff --git a/rc5.d/S02unattended-upgrades b/rc5.d/S02unattended-upgrades

new file mode 120000 (symlink)

index 0000000..9dd29fc
--- /dev/null
+++ b/rc5.d/S02unattended-upgrades
@@ -0,0 +1 @@
+../init.d/unattended-upgrades
+\ No newline at end of file
diff --git a/rc5.d/S02unifi b/rc5.d/S02unifi

new file mode 120000 (symlink)

index 0000000..0d48639
--- /dev/null
+++ b/rc5.d/S02unifi
@@ -0,0 +1 @@
+../init.d/unifi
+\ No newline at end of file
diff --git a/rc5.d/S02uuidd b/rc5.d/S02uuidd

new file mode 120000 (symlink)

index 0000000..ee54bd4
--- /dev/null
+++ b/rc5.d/S02uuidd
@@ -0,0 +1 @@
+../init.d/uuidd
+\ No newline at end of file
diff --git a/rc5.d/S02whoopsie b/rc5.d/S02whoopsie

deleted file mode 120000 (symlink)

index 90e4df7..0000000
--- a/rc5.d/S02whoopsie
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/whoopsie
-\ No newline at end of file
diff --git a/rc5.d/S03acpid b/rc5.d/S03acpid

new file mode 120000 (symlink)

index 0000000..e15f7fe
--- /dev/null
+++ b/rc5.d/S03acpid
@@ -0,0 +1 @@
+../init.d/acpid
+\ No newline at end of file
diff --git a/rc5.d/S03anacron b/rc5.d/S03anacron

new file mode 120000 (symlink)

index 0000000..fa373cf
--- /dev/null
+++ b/rc5.d/S03anacron
@@ -0,0 +1 @@
+../init.d/anacron
+\ No newline at end of file
diff --git a/rc5.d/S03avahi-daemon b/rc5.d/S03avahi-daemon

deleted file mode 120000 (symlink)

index d28b326..0000000
--- a/rc5.d/S03avahi-daemon
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/avahi-daemon
-\ No newline at end of file
diff --git a/rc5.d/S03batmand b/rc5.d/S03batmand

new file mode 120000 (symlink)

index 0000000..44edf4d
--- /dev/null
+++ b/rc5.d/S03batmand
@@ -0,0 +1 @@
+../init.d/batmand
+\ No newline at end of file
diff --git a/rc5.d/S03bluetooth b/rc5.d/S03bluetooth

deleted file mode 120000 (symlink)

index affb39f..0000000
--- a/rc5.d/S03bluetooth
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/bluetooth
-\ No newline at end of file
diff --git a/rc5.d/S03cron b/rc5.d/S03cron

new file mode 120000 (symlink)

index 0000000..b7a1f29
--- /dev/null
+++ b/rc5.d/S03cron
@@ -0,0 +1 @@
+../init.d/cron
+\ No newline at end of file
diff --git a/rc5.d/S03dbus b/rc5.d/S03dbus

new file mode 120000 (symlink)

index 0000000..05fdfc6
--- /dev/null
+++ b/rc5.d/S03dbus
@@ -0,0 +1 @@
+../init.d/dbus
+\ No newline at end of file
diff --git a/rc5.d/S03irqbalance b/rc5.d/S03irqbalance

new file mode 120000 (symlink)

index 0000000..10c5342
--- /dev/null
+++ b/rc5.d/S03irqbalance
@@ -0,0 +1 @@
+../init.d/irqbalance
+\ No newline at end of file
diff --git a/rc5.d/S03kerneloops b/rc5.d/S03kerneloops

new file mode 120000 (symlink)

index 0000000..328ba1d
--- /dev/null
+++ b/rc5.d/S03kerneloops
@@ -0,0 +1 @@
+../init.d/kerneloops
+\ No newline at end of file
diff --git a/rc5.d/S03lightdm b/rc5.d/S03lightdm

deleted file mode 120000 (symlink)

index ae17aeb..0000000
--- a/rc5.d/S03lightdm
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/lightdm
-\ No newline at end of file
diff --git a/rc5.d/S03postfix b/rc5.d/S03postfix

new file mode 120000 (symlink)

index 0000000..81e743c
--- /dev/null
+++ b/rc5.d/S03postfix
@@ -0,0 +1 @@
+../init.d/postfix
+\ No newline at end of file
diff --git a/rc5.d/S03rsync b/rc5.d/S03rsync

new file mode 120000 (symlink)

index 0000000..3f11f90
--- /dev/null
+++ b/rc5.d/S03rsync
@@ -0,0 +1 @@
+../init.d/rsync
+\ No newline at end of file
diff --git a/rc5.d/S03speech-dispatcher b/rc5.d/S03speech-dispatcher

new file mode 120000 (symlink)

index 0000000..ef1f482
--- /dev/null
+++ b/rc5.d/S03speech-dispatcher
@@ -0,0 +1 @@
+../init.d/speech-dispatcher
+\ No newline at end of file
diff --git a/rc5.d/S03ssh b/rc5.d/S03ssh

new file mode 120000 (symlink)

index 0000000..70e14ad
--- /dev/null
+++ b/rc5.d/S03ssh
@@ -0,0 +1 @@
+../init.d/ssh
+\ No newline at end of file
diff --git a/rc5.d/S03thermald b/rc5.d/S03thermald

new file mode 120000 (symlink)

index 0000000..0e051ba
--- /dev/null
+++ b/rc5.d/S03thermald
@@ -0,0 +1 @@
+../init.d/thermald
+\ No newline at end of file
diff --git a/rc5.d/S03whoopsie b/rc5.d/S03whoopsie

new file mode 120000 (symlink)

index 0000000..90e4df7
--- /dev/null
+++ b/rc5.d/S03whoopsie
@@ -0,0 +1 @@
+../init.d/whoopsie
+\ No newline at end of file
diff --git a/rc5.d/S04avahi-daemon b/rc5.d/S04avahi-daemon

new file mode 120000 (symlink)

index 0000000..d28b326
--- /dev/null
+++ b/rc5.d/S04avahi-daemon
@@ -0,0 +1 @@
+../init.d/avahi-daemon
+\ No newline at end of file
diff --git a/rc5.d/S04bluetooth b/rc5.d/S04bluetooth

new file mode 120000 (symlink)

index 0000000..affb39f
--- /dev/null
+++ b/rc5.d/S04bluetooth
@@ -0,0 +1 @@
+../init.d/bluetooth
+\ No newline at end of file
diff --git a/rc5.d/S04lightdm b/rc5.d/S04lightdm

new file mode 120000 (symlink)

index 0000000..ae17aeb
--- /dev/null
+++ b/rc5.d/S04lightdm
@@ -0,0 +1 @@
+../init.d/lightdm
+\ No newline at end of file
diff --git a/rc5.d/S04openvpn b/rc5.d/S04openvpn

deleted file mode 120000 (symlink)

index 7fc299b..0000000
--- a/rc5.d/S04openvpn
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/openvpn
-\ No newline at end of file
diff --git a/rc5.d/S05cups b/rc5.d/S05cups

deleted file mode 120000 (symlink)

index 9dae5ac..0000000
--- a/rc5.d/S05cups
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/cups
-\ No newline at end of file
diff --git a/rc5.d/S05cups-browsed b/rc5.d/S05cups-browsed

deleted file mode 120000 (symlink)

index 5485fd3..0000000
--- a/rc5.d/S05cups-browsed
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/cups-browsed
-\ No newline at end of file
diff --git a/rc5.d/S05openvpn b/rc5.d/S05openvpn

new file mode 120000 (symlink)

index 0000000..7fc299b
--- /dev/null
+++ b/rc5.d/S05openvpn
@@ -0,0 +1 @@
+../init.d/openvpn
+\ No newline at end of file
diff --git a/rc5.d/S05saned b/rc5.d/S05saned

deleted file mode 120000 (symlink)

index 4c6451c..0000000
--- a/rc5.d/S05saned
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/saned
-\ No newline at end of file
diff --git a/rc5.d/S06cups b/rc5.d/S06cups

new file mode 120000 (symlink)

index 0000000..9dae5ac
--- /dev/null
+++ b/rc5.d/S06cups
@@ -0,0 +1 @@
+../init.d/cups
+\ No newline at end of file
diff --git a/rc5.d/S06cups-browsed b/rc5.d/S06cups-browsed

new file mode 120000 (symlink)

index 0000000..5485fd3
--- /dev/null
+++ b/rc5.d/S06cups-browsed
@@ -0,0 +1 @@
+../init.d/cups-browsed
+\ No newline at end of file
diff --git a/rc5.d/S06grub-common b/rc5.d/S06grub-common

deleted file mode 120000 (symlink)

index 54e0dca..0000000
--- a/rc5.d/S06grub-common
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/grub-common
-\ No newline at end of file
diff --git a/rc5.d/S06ondemand b/rc5.d/S06ondemand

deleted file mode 120000 (symlink)

index de8e234..0000000
--- a/rc5.d/S06ondemand
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ondemand
-\ No newline at end of file
diff --git a/rc5.d/S06plymouth b/rc5.d/S06plymouth

deleted file mode 120000 (symlink)

index 1bede9b..0000000
--- a/rc5.d/S06plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/plymouth
-\ No newline at end of file
diff --git a/rc5.d/S06rc.local b/rc5.d/S06rc.local

deleted file mode 120000 (symlink)

index fb4ee0a..0000000
--- a/rc5.d/S06rc.local
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/rc.local
-\ No newline at end of file
diff --git a/rc5.d/S06saned b/rc5.d/S06saned

new file mode 120000 (symlink)

index 0000000..4c6451c
--- /dev/null
+++ b/rc5.d/S06saned
@@ -0,0 +1 @@
+../init.d/saned
+\ No newline at end of file
diff --git a/rc5.d/S07grub-common b/rc5.d/S07grub-common

new file mode 120000 (symlink)

index 0000000..54e0dca
--- /dev/null
+++ b/rc5.d/S07grub-common
@@ -0,0 +1 @@
+../init.d/grub-common
+\ No newline at end of file
diff --git a/rc5.d/S07ondemand b/rc5.d/S07ondemand

new file mode 120000 (symlink)

index 0000000..de8e234
--- /dev/null
+++ b/rc5.d/S07ondemand
@@ -0,0 +1 @@
+../init.d/ondemand
+\ No newline at end of file
diff --git a/rc5.d/S07plymouth b/rc5.d/S07plymouth

new file mode 120000 (symlink)

index 0000000..1bede9b
--- /dev/null
+++ b/rc5.d/S07plymouth
@@ -0,0 +1 @@
+../init.d/plymouth
+\ No newline at end of file
diff --git a/rc5.d/S07rc.local b/rc5.d/S07rc.local

new file mode 120000 (symlink)

index 0000000..fb4ee0a
--- /dev/null
+++ b/rc5.d/S07rc.local
@@ -0,0 +1 @@
+../init.d/rc.local
+\ No newline at end of file
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/S01dns-clean b/rcS.d/S01dns-clean

new file mode 120000 (symlink)

index 0000000..27ac773
--- /dev/null
+++ b/rcS.d/S01dns-clean
@@ -0,0 +1 @@
+../init.d/dns-clean
+\ 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/S01screen-cleanup b/rcS.d/S01screen-cleanup

new file mode 120000 (symlink)

index 0000000..205268c
--- /dev/null
+++ b/rcS.d/S01screen-cleanup
@@ -0,0 +1 @@
+../init.d/screen-cleanup
+\ 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/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/S02dns-clean b/rcS.d/S02dns-clean

deleted file mode 120000 (symlink)

index 27ac773..0000000
--- a/rcS.d/S02dns-clean
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/dns-clean
-\ 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/S02screen-cleanup b/rcS.d/S02screen-cleanup

deleted file mode 120000 (symlink)

index 205268c..0000000
--- a/rcS.d/S02screen-cleanup
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/screen-cleanup
-\ 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/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/S03keyboard-setup.sh b/rcS.d/S03keyboard-setup.sh

new file mode 120000 (symlink)

index 0000000..ee50a88
--- /dev/null
+++ b/rcS.d/S03keyboard-setup.sh
@@ -0,0 +1 @@
+../init.d/keyboard-setup.sh
+\ 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/resolvconf/resolv.conf.d/head b/resolvconf/resolv.conf.d/head

index 74505dd1f96afc3f7154cbf05c3819fb328492ee..c3e5badb92210c0d80cdb442e2ad7a4923b4e799 100644 (file)
--- a/resolvconf/resolv.conf.d/head
+++ b/resolvconf/resolv.conf.d/head
@@ -1,2 +1,5 @@
  # Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8)
  #     DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+# 127.0.0.53 is the systemd-resolved stub resolver.
+# run "systemd-resolve --status" to see details about the actual nameservers.
+
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/pwquality.conf b/security/pwquality.conf

index 75e8db8ba6b7fdc816c55442b7369890cdb5cf6a..550036d3027f89e7ce8557f9e7d06f7ac9c3f299 100644 (file)
--- a/security/pwquality.conf
+++ b/security/pwquality.conf
@@ -46,5 +46,18 @@
  # The check is enabled if the value is not 0.
  # gecoscheck = 0
  #
+# Whether to check for the words from the cracklib dictionary.
+# The check is enabled if the value is not 0.
+# dictcheck = 1
+#
+# Whether to check if it contains the user name in some form.
+# The check is enabled if the value is not 0.
+# usercheck = 1
+#
+# Whether the check is enforced by the PAM module and possibly other
+# applications.
+# The new password is rejected if it fails the check and the value is not 0.
+# enforcing = 1
+#
  # Path to the cracklib dictionaries. Default is to use the cracklib default.
  # dictpath =
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/services b/services

index 704cd12005fd2da23dad179f4d4e61a64767a5ab..e3202ec12a493266e08d784dd197f64fe01ebffe 100644 (file)
--- a/services
+++ b/services
@@ -28,7 +28,6 @@ ftp-data      20/tcp
  ftp            21/tcp
  fsp            21/udp          fspd
  ssh            22/tcp                          # SSH Remote Login Protocol
-ssh            22/udp
  telnet         23/tcp
  smtp           25/tcp          mail
  time           37/tcp          timserver
@@ -42,7 +41,6 @@ re-mail-ck    50/tcp                          # Remote Mail Checking Protocol
  re-mail-ck     50/udp
  domain         53/tcp                          # Domain Name Server
  domain         53/udp
-mtp            57/tcp                          # deprecated
  tacacs-ds      65/tcp                          # TACACS-Database Service
  tacacs-ds      65/udp
  bootps         67/tcp                          # BOOTP server
@@ -51,11 +49,8 @@ bootpc               68/tcp                          # BOOTP client
  bootpc         68/udp
  tftp           69/udp
  gopher         70/tcp                          # Internet Gopher
-gopher         70/udp
-rje            77/tcp          netrjs
  finger         79/tcp
  http           80/tcp          www             # WorldWideWeb HTTP
-http           80/udp                          # HyperText Transfer Protocol
  link           87/tcp          ttylink
  kerberos       88/tcp          kerberos5 krb5 kerberos-sec     # Kerberos v5
  kerberos       88/udp          kerberos5 krb5 kerberos-sec     # Kerberos v5
@@ -68,15 +63,11 @@ csnet-ns    105/tcp         cso-ns          # also used by CSO name server
  csnet-ns       105/udp         cso-ns
  rtelnet                107/tcp                         # Remote Telnet
  rtelnet                107/udp
-pop2           109/tcp         postoffice pop-2 # POP version 2
-pop2           109/udp         pop-2
  pop3           110/tcp         pop-3           # POP version 3
-pop3           110/udp         pop-3
  sunrpc         111/tcp         portmapper      # RPC 4.0 portmapper
  sunrpc         111/udp         portmapper
  auth           113/tcp         authentication tap ident
  sftp           115/tcp
-uucp-path      117/tcp
  nntp           119/tcp         readnews untp   # USENET News Transfer Protocol
  ntp            123/tcp
  ntp            123/udp                         # Network Time Protocol
@@ -91,7 +82,6 @@ netbios-dgm   138/udp
  netbios-ssn    139/tcp                         # NETBIOS session service
  netbios-ssn    139/udp
  imap2          143/tcp         imap            # Interim Mail Access P 2 and 4
-imap2          143/udp         imap
  snmp           161/tcp                         # Simple Net Mgmt Protocol
  snmp           161/udp
  snmp-trap      162/tcp         snmptrap        # Traps for SNMP
@@ -107,9 +97,6 @@ xdmcp                177/udp
  nextstep       178/tcp         NeXTStep NextStep       # NeXTStep window
  nextstep       178/udp         NeXTStep NextStep       #  server
  bgp            179/tcp                         # Border Gateway Protocol
-bgp            179/udp
-prospero       191/tcp                         # Cliff Neuman's Prospero
-prospero       191/udp
  irc            194/tcp                         # Internet Relay Chat
  irc            194/udp
  smux           199/tcp                         # SNMP Unix Multiplexer
@@ -128,8 +115,6 @@ z3950               210/tcp         wais            # NISO Z39.50 database
  z3950          210/udp         wais
  ipx            213/tcp                         # IPX
  ipx            213/udp
-imap3          220/tcp                         # Interactive Mail Access
-imap3          220/udp                         # Protocol v3
  pawserv                345/tcp                         # Perf Analysis Workbench
  pawserv                345/udp
  zserv          346/tcp                         # Zebra server
@@ -151,7 +136,6 @@ imsp                406/udp
  svrloc         427/tcp                         # Server Location
  svrloc         427/udp
  https          443/tcp                         # http protocol over TLS/SSL
-https          443/udp
  snpp           444/tcp                         # Simple Network Paging Protocol
  snpp           444/udp
  microsoft-ds   445/tcp                         # Microsoft Naked CIFS
@@ -212,9 +196,7 @@ idfp                549/tcp
  idfp           549/udp
  remotefs       556/tcp         rfs_server rfs  # Brunhoff remote filesystem
  nntps          563/tcp         snntp           # NNTP over SSL
-nntps          563/udp         snntp
  submission     587/tcp                         # Submission [RFC4409]
-submission     587/udp
  ldaps          636/tcp                         # LDAP over SSL
  ldaps          636/udp
  tinc           655/tcp                         # tinc control port
@@ -226,17 +208,11 @@ kerberos-adm      749/tcp                         # Kerberos `kadmin' (v5)
  webster                765/tcp                         # Network dictionary
  webster                765/udp
  rsync          873/tcp
-rsync          873/udp
  ftps-data      989/tcp                         # FTP over SSL (data)
  ftps           990/tcp
  telnets                992/tcp                         # Telnet over SSL
-telnets                992/udp
  imaps          993/tcp                         # IMAP over SSL
-imaps          993/udp
-ircs           994/tcp                         # IRC over SSL
-ircs           994/udp
  pop3s          995/tcp                         # POP-3 over SSL
-pop3s          995/udp
  #
  # From ``Assigned Numbers'':
  #
@@ -274,8 +250,6 @@ ms-sql-m    1434/tcp                        # Microsoft SQL Monitor
  ms-sql-m       1434/udp
  ingreslock     1524/tcp
  ingreslock     1524/udp
-prospero-np    1525/tcp                        # Prospero non-privileged
-prospero-np    1525/udp
  datametrics    1645/tcp        old-radius
  datametrics    1645/udp        old-radius
  sa-msg-port    1646/tcp        old-radacct
@@ -333,6 +307,8 @@ gds-db              3050/tcp        gds_db          # InterBase server
  gds-db         3050/udp        gds_db
  icpv2          3130/tcp        icp             # Internet Cache Protocol
  icpv2          3130/udp        icp
+isns           3205/tcp                        # iSNS Server Port
+isns           3205/udp                        # iSNS Server Port
  iscsi-target   3260/tcp
  mysql          3306/tcp
  mysql          3306/udp
@@ -416,6 +392,8 @@ sge-execd   6445/tcp        sge_execd       # Grid Engine Execution Service
  sge-execd      6445/udp        sge_execd
  mysql-proxy    6446/tcp                        # MySQL Proxy
  mysql-proxy    6446/udp
+babel          6696/udp                        # Babel Routing Protocol
+ircs-u         6697/tcp                # Internet Relay Chat via TLS/SSL
  afs3-fileserver 7000/tcp       bbs             # file server itself
  afs3-fileserver 7000/udp       bbs
  afs3-callback  7001/tcp                        # callbacks to cache managers
@@ -440,6 +418,7 @@ font-service        7100/tcp        xfs             # X Font Service
  font-service   7100/udp        xfs
  http-alt       8080/tcp        webcache        # WWW caching service
  http-alt       8080/udp
+puppet         8140/tcp                        # The Puppet master service
  bacula-dir     9101/tcp                        # Bacula Director
  bacula-dir     9101/udp
  bacula-fd      9102/tcp                        # Bacula File Daemon
diff --git a/shadow b/shadow

index 7b69ace7e91935b7cacb627bc891a9fa8f11c489..cacf82421cc3c0b57bc1771c2e6a48b63e4878ac 100644 (file)
--- a/shadow
+++ b/shadow
@@ -48,3 +48,4 @@ mongodb:*:17457:0:99999:7:::
  trezord:!:17738::::::
  susi:$6$Fcb59jpZ$88N57qIZj1cwxBeklmMoGkFkCmnSpNxC.eWkAVzDAtmgdCiEDdWDXz4XvOdl.VThcynXtWeonUNCKUvLfku2J0:17751:0:99999:7:::
  bitcoin:*:17765:0:99999:7:::
+cups-pk-helper:*:17767:0:99999:7:::
diff --git a/shadow- b/shadow-

index 7b69ace7e91935b7cacb627bc891a9fa8f11c489..cacf82421cc3c0b57bc1771c2e6a48b63e4878ac 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -48,3 +48,4 @@ mongodb:*:17457:0:99999:7:::
  trezord:!:17738::::::
  susi:$6$Fcb59jpZ$88N57qIZj1cwxBeklmMoGkFkCmnSpNxC.eWkAVzDAtmgdCiEDdWDXz4XvOdl.VThcynXtWeonUNCKUvLfku2J0:17751:0:99999:7:::
  bitcoin:*:17765:0:99999:7:::
+cups-pk-helper:*:17767:0:99999:7:::
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/smi.conf b/smi.conf

index 5e340f125b7276c087621c709709fe8cb7fcb920..744ec22f7130630a30d1450bdd4eeadcff297262 100644 (file)
--- a/smi.conf
+++ b/smi.conf
@@ -14,9 +14,11 @@
  # Extend (note the semicolon) the libsmi default module search path.
  # (On Windows systems, use `;' instead of `:', and `\' instead of `/'.)
  
-path :/usr/share/mibs/iana
-path :/usr/share/mibs/ietf
-path :/usr/share/mibs/netsnmp
+path :/usr/share/snmp/mibs
+path :/usr/share/snmp/mibs/iana
+path :/usr/share/snmp/mibs/ietf
+path :/usr/share/snmp/mibs/site
+path :/var/lib/snmp/mibs/site
  path :/usr/share/mibs/site
  
  # Don't show any errors by default.
diff --git a/systemd/system/emergency.target.wants/friendly-recovery.service b/systemd/system/emergency.target.wants/friendly-recovery.service

new file mode 120000 (symlink)

index 0000000..22c4053
--- /dev/null
+++ b/systemd/system/emergency.target.wants/friendly-recovery.service
@@ -0,0 +1 @@
+/lib/systemd/system/friendly-recovery.service
+\ No newline at end of file
diff --git a/systemd/system/hibernate.target.wants/anacron-resume.service b/systemd/system/hibernate.target.wants/anacron-resume.service

deleted file mode 120000 (symlink)

index b010583..0000000
--- a/systemd/system/hibernate.target.wants/anacron-resume.service
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/anacron-resume.service
-\ No newline at end of file
diff --git a/systemd/system/hybrid-sleep.target.wants/anacron-resume.service b/systemd/system/hybrid-sleep.target.wants/anacron-resume.service

deleted file mode 120000 (symlink)

index b010583..0000000
--- a/systemd/system/hybrid-sleep.target.wants/anacron-resume.service
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/anacron-resume.service
-\ No newline at end of file
diff --git a/systemd/system/multi-user.target.wants/console-setup.service b/systemd/system/multi-user.target.wants/console-setup.service

new file mode 120000 (symlink)

index 0000000..29fafc8
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/console-setup.service
@@ -0,0 +1 @@
+/lib/systemd/system/console-setup.service
+\ No newline at end of file
diff --git a/systemd/system/multi-user.target.wants/irqbalance.service b/systemd/system/multi-user.target.wants/irqbalance.service

new file mode 120000 (symlink)

index 0000000..acfa2e5
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/irqbalance.service
@@ -0,0 +1 @@
+/lib/systemd/system/irqbalance.service
+\ No newline at end of file
diff --git a/systemd/system/multi-user.target.wants/rsync.service b/systemd/system/multi-user.target.wants/rsync.service

new file mode 120000 (symlink)

index 0000000..57e0b03
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/rsync.service
@@ -0,0 +1 @@
+/lib/systemd/system/rsync.service
+\ No newline at end of file
diff --git a/systemd/system/rescue.target.wants/friendly-recovery.service b/systemd/system/rescue.target.wants/friendly-recovery.service

new file mode 120000 (symlink)

index 0000000..22c4053
--- /dev/null
+++ b/systemd/system/rescue.target.wants/friendly-recovery.service
@@ -0,0 +1 @@
+/lib/systemd/system/friendly-recovery.service
+\ No newline at end of file
diff --git a/systemd/system/suspend.target.wants/anacron-resume.service b/systemd/system/suspend.target.wants/anacron-resume.service

deleted file mode 120000 (symlink)

index b010583..0000000
--- a/systemd/system/suspend.target.wants/anacron-resume.service
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/anacron-resume.service
-\ No newline at end of file
diff --git a/systemd/system/sysinit.target.wants/blk-availability.service b/systemd/system/sysinit.target.wants/blk-availability.service

new file mode 120000 (symlink)

index 0000000..3af3fda
--- /dev/null
+++ b/systemd/system/sysinit.target.wants/blk-availability.service
@@ -0,0 +1 @@
+/lib/systemd/system/blk-availability.service
+\ No newline at end of file
diff --git a/systemd/system/sysinit.target.wants/keyboard-setup.service b/systemd/system/sysinit.target.wants/keyboard-setup.service

new file mode 120000 (symlink)

index 0000000..b84cde0
--- /dev/null
+++ b/systemd/system/sysinit.target.wants/keyboard-setup.service
@@ -0,0 +1 @@
+/lib/systemd/system/keyboard-setup.service
+\ No newline at end of file
diff --git a/systemd/system/sysinit.target.wants/setvtrgb.service b/systemd/system/sysinit.target.wants/setvtrgb.service

new file mode 120000 (symlink)

index 0000000..8e2eabc
--- /dev/null
+++ b/systemd/system/sysinit.target.wants/setvtrgb.service
@@ -0,0 +1 @@
+/lib/systemd/system/setvtrgb.service
+\ No newline at end of file
diff --git a/systemd/system/systemd-resolved.service.wants/resolvconf-pull-resolved.path b/systemd/system/systemd-resolved.service.wants/resolvconf-pull-resolved.path

new file mode 120000 (symlink)

index 0000000..fc93e99
--- /dev/null
+++ b/systemd/system/systemd-resolved.service.wants/resolvconf-pull-resolved.path
@@ -0,0 +1 @@
+/lib/systemd/system/resolvconf-pull-resolved.path
+\ No newline at end of file
diff --git a/systemd/system/timers.target.wants/anacron.timer b/systemd/system/timers.target.wants/anacron.timer

new file mode 120000 (symlink)

index 0000000..0acf85e
--- /dev/null
+++ b/systemd/system/timers.target.wants/anacron.timer
@@ -0,0 +1 @@
+/lib/systemd/system/anacron.timer
+\ No newline at end of file
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/systemd/system/timers.target.wants/phpsessionclean.timer b/systemd/system/timers.target.wants/phpsessionclean.timer

new file mode 120000 (symlink)

index 0000000..7fcf1bb
--- /dev/null
+++ b/systemd/system/timers.target.wants/phpsessionclean.timer
@@ -0,0 +1 @@
+/lib/systemd/system/phpsessionclean.timer
+\ No newline at end of file
diff --git a/tmpfiles.d/screen-cleanup.conf b/tmpfiles.d/screen-cleanup.conf

new file mode 100644 (file)

index 0000000..eb1b9f8
--- /dev/null
+++ b/tmpfiles.d/screen-cleanup.conf
@@ -0,0 +1 @@
+d /run/screen 1777 root utmp
diff --git a/ufw/before6.rules b/ufw/before6.rules

index 1102d3f76bc63728a8b3275e378d13b8e7c8d2cc..30e90c7dbd9d49a24ef24609cc6291dfbd044c1e 100644 (file)
--- a/ufw/before6.rules
+++ b/ufw/before6.rules
@@ -77,8 +77,8 @@
  -A ufw6-before-output -p icmpv6 --icmpv6-type time-exceeded -j ACCEPT
  # codes 0-2
  -A ufw6-before-output -p icmpv6 --icmpv6-type parameter-problem -j ACCEPT
--A ufw6-before-input -p icmpv6 --icmpv6-type echo-request -j ACCEPT
--A ufw6-before-input -p icmpv6 --icmpv6-type echo-reply -j ACCEPT
+-A ufw6-before-output -p icmpv6 --icmpv6-type echo-request -j ACCEPT
+-A ufw6-before-output -p icmpv6 --icmpv6-type echo-reply -j ACCEPT
  -A ufw6-before-output -p icmpv6 --icmpv6-type router-solicitation -m hl --hl-eq 255 -j ACCEPT
  -A ufw6-before-output -p icmpv6 --icmpv6-type neighbor-advertisement -m hl --hl-eq 255 -j ACCEPT
  -A ufw6-before-output -p icmpv6 --icmpv6-type neighbor-solicitation -m hl --hl-eq 255 -j ACCEPT
diff --git a/ufw/sysctl.conf b/ufw/sysctl.conf

index 870703221174db981748d860deed24117a2d4b0a..7bebf815137f87932a13b192cc8592450f82da50 100644 (file)
--- a/ufw/sysctl.conf
+++ b/ufw/sysctl.conf
@@ -1,7 +1,9 @@
  #
  # Configuration file for setting network variables. Please note these settings
-# override /etc/sysctl.conf. If you prefer to use /etc/sysctl.conf, please
-# adjust IPT_SYSCTL in /etc/default/ufw.
+# override /etc/sysctl.conf and /etc/sysctl.d. If you prefer to use
+# /etc/sysctl.conf, please adjust IPT_SYSCTL in /etc/default/ufw. See
+# Documentation/networking/ip-sysctl.txt in the kernel source code for more
+# information.
  #
  
  # Uncomment this to allow this host to route packets between interfaces
@@ -9,48 +11,30 @@
  #net/ipv6/conf/default/forwarding=1
  #net/ipv6/conf/all/forwarding=1
  
-# Turn on Source Address Verification in all interfaces to prevent some
-# spoofing attacks
-net/ipv4/conf/default/rp_filter=1
-net/ipv4/conf/all/rp_filter=1
-
-# Do not accept IP source route packets (we are not a router)
-net/ipv4/conf/default/accept_source_route=0
-net/ipv4/conf/all/accept_source_route=0
-net/ipv6/conf/default/accept_source_route=0
-net/ipv6/conf/all/accept_source_route=0
-
  # Disable ICMP redirects. ICMP redirects are rarely used but can be used in
  # MITM (man-in-the-middle) attacks. Disabling ICMP may disrupt legitimate
  # traffic to those sites.
-net/ipv4/conf/default/accept_redirects=0
  net/ipv4/conf/all/accept_redirects=0
-net/ipv6/conf/default/accept_redirects=0
+net/ipv4/conf/default/accept_redirects=0
  net/ipv6/conf/all/accept_redirects=0
+net/ipv6/conf/default/accept_redirects=0
  
  # Ignore bogus ICMP errors
  net/ipv4/icmp_echo_ignore_broadcasts=1
  net/ipv4/icmp_ignore_bogus_error_responses=1
  net/ipv4/icmp_echo_ignore_all=0
  
-# Don't log Martian Packets (impossible packets)
-net/ipv4/conf/default/log_martians=0
+# Don't log Martian Packets (impossible addresses)
+# packets
  net/ipv4/conf/all/log_martians=0
-
-# Change to '1' to enable TCP/IP SYN cookies This disables TCP Window Scaling
-# (http://lkml.org/lkml/2008/2/5/167)
-net/ipv4/tcp_syncookies=0
+net/ipv4/conf/default/log_martians=0
  
  #net/ipv4/tcp_fin_timeout=30
  #net/ipv4/tcp_keepalive_intvl=1800
  
-# normally allowing tcp_sack is ok, but if going through OpenBSD 3.8 RELEASE or
-# earlier pf firewall, should set this to 0
-net/ipv4/tcp_sack=1
-
  # Uncomment this to turn off ipv6 autoconfiguration
-#net/ipv6/conf/default/autoconf=0
-#net/ipv6/conf/all/autoconf=0
+#net/ipv6/conf/default/autoconf=1
+#net/ipv6/conf/all/autoconf=1
  
  # Uncomment this to enable ipv6 privacy addressing
  #net/ipv6/conf/default/use_tempaddr=2
diff --git a/update-manager/meta-release b/update-manager/meta-release

index daf39b91c09521a1a34d1771c49a08c1bbe49dd7..0793c9e53a9614743383f2025b37ae47927bcc25 100644 (file)
--- a/update-manager/meta-release
+++ b/update-manager/meta-release
@@ -1,7 +1,7 @@
  # default location for the meta-release file
  
  [METARELEASE]
-URI = http://changelogs.ubuntu.com/meta-release
-URI_LTS = http://changelogs.ubuntu.com/meta-release-lts
+URI = https://changelogs.ubuntu.com/meta-release
+URI_LTS = https://changelogs.ubuntu.com/meta-release-lts
  URI_UNSTABLE_POSTFIX = -development
  URI_PROPOSED_POSTFIX = -proposed
diff --git a/update-motd.d/50-motd-news b/update-motd.d/50-motd-news

new file mode 100755 (executable)

index 0000000..e031cdf
--- /dev/null
+++ b/update-motd.d/50-motd-news
@@ -0,0 +1,123 @@
+#!/bin/sh
+#
+#    50-motd-news - print the live news from the Ubuntu wire
+#    Copyright (C) 2016-2017 Canonical Ltd.
+#    Copyright (C) 2016-2017 Dustin Kirkland
+#
+#    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.
+
+##############################################################################
+# This program could be rewritten in C or Golang for faster performance.
+# Or it could be rewritten in Python or another higher level language
+# for more modularity.
+# However, I've insisted on shell here for transparency!
+#                                                                     - Dustin
+##############################################################################
+
+# Source the local configuration
+[ -r /etc/default/motd-news ] && . /etc/default/motd-news
+
+# Exit immediately, unless we're enabled
+# This makes this script very easy to disable in /etc/default/motd-news configuration
+[ "$ENABLED" = "1" ] || exit 0
+
+# Ensure sane defaults
+[ -n "$URLS" ] || URLS="https://motd.ubuntu.com"
+[ -n "$WAIT" ] || WAIT=5
+[ -n "$CACHE" ] || CACHE="/var/cache/motd-news"
+[ "$1" = "--force" ] && FORCED=1
+
+# Ensure we print safely, maximum of the first 10 lines,
+# maximum of the first 80 chars per line, no control chars
+safe_print() {
+       cat "$1" | head -n 10 | tr -d '\000-\011\013\014\016-\037' | cut -c -80
+}
+
+
+# If we're not forcing an update, and we have a cached motd-news file,
+# then just print it and exit as quickly as possible, for login performance.
+# Note that systemd should keep this cache file up to date, asynchronously
+if [ "$FORCED" != "1" ]; then
+       if [ -r $CACHE ]; then
+               echo
+               safe_print $CACHE
+       else
+               : > $CACHE
+       fi
+       exit 0
+fi
+
+# If we've made it here, we've been given the --force argument,
+# probably from the systemd motd-news.service.  Let's update...
+
+# Generate our temp files, clean up when done
+NEWS=$(mktemp) || exit 1
+ERR=$(mktemp) || exit 1
+trap "rm -f $NEWS $ERR" HUP INT QUIT ILL TRAP KILL BUS TERM
+
+# Construct a user agent, similar to Firefox/Chrome/Safari/IE to
+# ensure a proper, tailored, accurate message of the day
+
+# Curl browser version, for debug purposes
+curl_ver="$(dpkg -l curl | awk '$1 == "ii" { print($3); exit(0); }')"
+
+# Distribution version, for messages releated to this Ubuntu release
+. /etc/lsb-release
+lsb=$(echo "$DISTRIB_DESCRIPTION" | sed -e "s/ /\//g")
+codename="$DISTRIB_CODENAME"
+
+# Kernel version and CPU type, for messages related to a particular revision or hardware
+platform="$(uname -o)/$(uname -r)/$(uname -m)"
+arch="$(uname -m)"
+cpu="$(grep -m1 "^model name" /proc/cpuinfo | sed -e "s/.*: //" -e "s:\s\+:/:g")"
+
+# Some messages may only be pertinent before or after some amount of uptime
+read up idle < /proc/uptime
+uptime="uptime/$up/$idle"
+
+# Piece together the user agent
+USER_AGENT="curl/$curl_ver $lsb $platform $cpu $uptime"
+
+# Loop over any configured URLs
+for u in $URLS; do
+       # Ensure https:// protocol, for security reasons
+       case $u in
+               https://*)
+                       true
+               ;;
+               https://motd.ubuntu.com)
+                       u="$u/$codename/$arch"
+               ;;
+               *)
+                       continue
+               ;;
+       esac
+       # If we're forced, set the wait to much higher (1 minute)
+       [ "$FORCED" = "1" ] && WAIT=60
+       # Fetch and print the news motd
+       if curl --connect-timeout "$WAIT" --max-time "$WAIT" -A "$USER_AGENT" -o- "$u" >"$NEWS" 2>"$ERR"; then
+               echo
+               # At most, 10 lines of text, remove control characters, print at most 80 characters per line
+               safe_print "$NEWS"
+               # Try to update the cache
+               safe_print "$NEWS" 2>/dev/null >$CACHE || true
+       else
+               : > "$CACHE"
+       fi
+done
+rm -f "$NEWS" "$ERR"
+exit 0
diff --git a/updatedb.conf b/updatedb.conf

index 47a1b7722e21729e0f31465ffea353c083bd33b8..4221f3a009e532247c73ea7afb5f99d81e270d6e 100644 (file)
--- a/updatedb.conf
+++ b/updatedb.conf
@@ -1,4 +1,4 @@
  PRUNE_BIND_MOUNTS="yes"
  # PRUNENAMES=".git .bzr .hg .svn"
-PRUNEPATHS="/tmp /var/spool /media /home/.ecryptfs /var/lib/schroot"
-PRUNEFS="NFS nfs nfs4 rpc_pipefs afs binfmt_misc proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs shfs sysfs cifs lustre tmpfs usbfs udf fuse.glusterfs fuse.sshfs curlftpfs ecryptfs fusesmb devtmpfs"
+PRUNEPATHS="/tmp /var/spool /media /var/lib/os-prober /var/lib/ceph /home/.ecryptfs /var/lib/schroot"
+PRUNEFS="NFS nfs nfs4 rpc_pipefs afs binfmt_misc proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs devtmpfs fuse.mfs shfs sysfs cifs lustre tmpfs usbfs udf fuse.glusterfs fuse.sshfs curlftpfs ceph fuse.ceph fuse.rozofs ecryptfs fusesmb"
diff --git a/wildmidi/wildmidi.cfg b/wildmidi/wildmidi.cfg

index c21b030c74bc4c0e8420724da9f39b641b050c51..33b222baa9b65f2a0c51781941817c765adf8926 100644 (file)
--- a/wildmidi/wildmidi.cfg
+++ b/wildmidi/wildmidi.cfg
@@ -5,135 +5,135 @@ dir /usr/share/midi/freepats
  
  drumset 0
  
- 25    Drum_000/025_Snare_Roll.pat 
- 26    Drum_000/026_Snap.pat 
- 27    Drum_000/027_High_Q.pat 
- 31    Drum_000/031_Sticks.pat 
- 32    Drum_000/032_Square_Click.pat 
- 33    Drum_000/033_Metronome_Click.pat 
- 34    Drum_000/034_Metronome_Bell.pat 
+ 25    Drum_000/025_Snare_Roll.pat
+ 26    Drum_000/026_Snap.pat
+ 27    Drum_000/027_High_Q.pat
+ 31    Drum_000/031_Sticks.pat
+ 32    Drum_000/032_Square_Click.pat
+ 33    Drum_000/033_Metronome_Click.pat
+ 34    Drum_000/034_Metronome_Bell.pat
   35    Drum_000/035_Kick_1.pat amp=100
   36    Drum_000/036_Kick_2.pat amp=100
- 37    Drum_000/037_Stick_Rim.pat 
- 38    Drum_000/038_Snare_1.pat 
+ 37    Drum_000/037_Stick_Rim.pat
+ 38    Drum_000/038_Snare_1.pat
   39    Drum_000/039_Clap_Hand.pat amp=100
- 40    Drum_000/040_Snare_2.pat 
+ 40    Drum_000/040_Snare_2.pat
   41    Drum_000/041_Tom_Low_2.pat amp=100
- 42    Drum_000/042_Hi-Hat_Closed.pat 
+ 42    Drum_000/042_Hi-Hat_Closed.pat
   43    Drum_000/043_Tom_Low_1.pat amp=100
- 44    Drum_000/044_Hi-Hat_Pedal.pat 
+ 44    Drum_000/044_Hi-Hat_Pedal.pat
   45    Drum_000/045_Tom_Mid_2.pat amp=100
- 46    Drum_000/046_Hi-Hat_Open.pat 
+ 46    Drum_000/046_Hi-Hat_Open.pat
   47    Drum_000/047_Tom_Mid_1.pat amp=100
   48    Drum_000/048_Tom_High_2.pat amp=100
- 49    Drum_000/049_Cymbal_Crash_1.pat 
+ 49    Drum_000/049_Cymbal_Crash_1.pat
   50    Drum_000/050_Tom_High_1.pat amp=100
- 51    Drum_000/051_Cymbal_Ride_1.pat 
- 52    Drum_000/052_Cymbal_Chinese.pat 
+ 51    Drum_000/051_Cymbal_Ride_1.pat
+ 52    Drum_000/052_Cymbal_Chinese.pat
   53    Drum_000/053_Cymbal_Ride_Bell.pat amp=100
- 54    Drum_000/054_Tombourine.pat 
- 55    Drum_000/055_Cymbal_Splash.pat 
- 56    Drum_000/056_Cow_Bell.pat 
- 57    Drum_000/057_Cymbal_Crash_2.pat 
- 58    Drum_000/058_Vibra-Slap.pat 
- 59    Drum_000/059_Cymbal_Ride_2.pat 
- 60    Drum_000/060_Bongo_High.pat 
- 61    Drum_000/061_Bongo_Low.pat 
- 62    Drum_000/062_Conga_High_1_Mute.pat 
- 63    Drum_000/063_Conga_High_2_Open.pat 
- 64    Drum_000/064_Conga_Low.pat 
- 65    Drum_000/065_Timbale_High.pat 
- 66    Drum_000/066_Timbale_Low.pat 
- 67    Drum_000/067_Agogo_High.pat 
- 68    Drum_000/068_Agogo_Low.pat 
+ 54    Drum_000/054_Tombourine.pat
+ 55    Drum_000/055_Cymbal_Splash.pat
+ 56    Drum_000/056_Cow_Bell.pat
+ 57    Drum_000/057_Cymbal_Crash_2.pat
+ 58    Drum_000/058_Vibra-Slap.pat
+ 59    Drum_000/059_Cymbal_Ride_2.pat
+ 60    Drum_000/060_Bongo_High.pat
+ 61    Drum_000/061_Bongo_Low.pat
+ 62    Drum_000/062_Conga_High_1_Mute.pat
+ 63    Drum_000/063_Conga_High_2_Open.pat
+ 64    Drum_000/064_Conga_Low.pat
+ 65    Drum_000/065_Timbale_High.pat
+ 66    Drum_000/066_Timbale_Low.pat
+ 67    Drum_000/067_Agogo_High.pat
+ 68    Drum_000/068_Agogo_Low.pat
   69    Drum_000/069_Cabasa.pat amp=100
- 70    Drum_000/070_Maracas.pat 
- 71    Drum_000/071_Whistle_1_High_Short.pat 
- 72    Drum_000/072_Whistle_2_Low_Long.pat 
- 73    Drum_000/073_Guiro_1_Short.pat 
- 74    Drum_000/074_Guiro_2_Long.pat 
+ 70    Drum_000/070_Maracas.pat
+ 71    Drum_000/071_Whistle_1_High_Short.pat
+ 72    Drum_000/072_Whistle_2_Low_Long.pat
+ 73    Drum_000/073_Guiro_1_Short.pat
+ 74    Drum_000/074_Guiro_2_Long.pat
   75    Drum_000/075_Claves.pat amp=100
- 76    Drum_000/076_Wood_Block_1_High.pat 
- 77    Drum_000/077_Wood_Block_2_Low.pat 
+ 76    Drum_000/076_Wood_Block_1_High.pat
+ 77    Drum_000/077_Wood_Block_2_Low.pat
   78    Drum_000/078_Cuica_1_Mute.pat amp=100
   79    Drum_000/079_Cuica_2_Open.pat amp=100
- 80    Drum_000/080_Triangle_1_Mute.pat 
- 81    Drum_000/081_Triangle_2_Open.pat 
- 82    Drum_000/082_Shaker.pat 
- 84    Drum_000/084_Belltree.pat 
+ 80    Drum_000/080_Triangle_1_Mute.pat
+ 81    Drum_000/081_Triangle_2_Open.pat
+ 82    Drum_000/082_Shaker.pat
+ 84    Drum_000/084_Belltree.pat
  
  bank 0
  
   0     Tone_000/000_Acoustic_Grand_Piano.pat amp=120 pan=center
- 1     Tone_000/001_Acoustic_Brite_Piano.pat 
- 2     Tone_000/002_Electric_Grand_Piano.pat 
- 4     Tone_000/004_Electric_Piano_1_Rhodes.pat 
- 5     Tone_000/005_Electric_Piano_2_Chorused_Yamaha_DX.pat 
- 6     Tone_000/006_Harpsichord.pat 
- 7     Tone_000/007_Clavinet.pat 
- 8     Tone_000/008_Celesta.pat 
- 9     Tone_000/009_Glockenspiel.pat 
- 13    Tone_000/013_Xylophone.pat 
- 14    Tone_000/014_Tubular_Bells.pat 
- 15    Tone_000/015_Dulcimer.pat 
- 16    Tone_000/016_Hammond_Organ.pat 
- 19    Tone_000/019_Church_Organ.pat 
- 21    Tone_000/021_Accordion.pat 
- 23    Tone_000/023_Tango_Accordion.pat 
- 24    Tone_000/024_Nylon_Guitar.pat 
- 25    Tone_000/025_Steel_Guitar.pat 
- 26    Tone_000/026_Jazz_Guitar.pat 
- 27    Tone_000/027_Clean_Electric_Guitar.pat 
- 28    Tone_000/028_Muted_Electric_Guitar.pat 
- 29    Tone_000/029_Overdriven_Guitar.pat 
- 30    Tone_000/030_Distortion_Guitar.pat 
- 32    Tone_000/032_Acoustic_Bass.pat 
- 33    Tone_000/033_Finger_Bass.pat 
- 34    Tone_000/034_Pick_Bass.pat 
- 35    Tone_000/035_Fretless_Bass.pat 
- 36    Tone_000/036_Slap_Bass_1.pat 
- 37    Tone_000/037_Slap_Bass_2.pat 
- 38    Tone_000/038_Synth_Bass_1.pat 
- 40    Tone_000/040_Violin.pat 
- 42    Tone_000/042_Cello.pat 
- 44    Tone_000/044_Tremolo_Strings.pat 
- 45    Tone_000/045_Pizzicato_Strings.pat 
- 46    Tone_000/046_Harp.pat 
- 47    Tone_000/047_Timpani.pat 
- 48    Tone_000/048_String_Ensemble_1_Marcato.pat 
- 53    Tone_000/053_Voice_Oohs.pat 
- 56    Tone_000/056_Trumpet.pat 
- 57    Tone_000/057_Trombone.pat 
- 58    Tone_000/058_Tuba.pat 
- 59    Tone_000/059_Muted_Trumpet.pat 
- 60    Tone_000/060_French_Horn.pat 
- 61    Tone_000/061_Brass_Section.pat 
- 64    Tone_000/064_Soprano_Sax.pat 
- 65    Tone_000/065_Alto_Sax.pat 
- 66    Tone_000/066_Tenor_Sax.pat 
- 67    Tone_000/067_Baritone_Sax.pat 
- 68    Tone_000/068_Oboe.pat 
- 69    Tone_000/069_English_Horn.pat 
- 70    Tone_000/070_Bassoon.pat 
- 71    Tone_000/071_Clarinet.pat 
- 72    Tone_000/072_Piccolo.pat 
- 73    Tone_000/073_Flute.pat 
- 74    Tone_000/074_Recorder.pat 
- 75    Tone_000/075_Pan_Flute.pat 
- 76    Tone_000/076_Bottle_Blow.pat 
- 79    Tone_000/079_Ocarina.pat 
- 80    Tone_000/080_Square_Wave.pat 
- 84    Tone_000/084_Charang.pat 
- 88    Tone_000/088_New_Age.pat 
- 94    Tone_000/094_Halo_Pad.pat 
- 95    Tone_000/095_Sweep_Pad.pat 
- 98    Tone_000/098_Crystal.pat 
- 101   Tone_000/101_Goblins--Unicorn.pat 
- 102   Tone_000/102_Echo_Voice.pat 
- 104   Tone_000/104_Sitar.pat 
- 114   Tone_000/114_Steel_Drums.pat 
- 115   Tone_000/115_Wood_Block.pat 
- 120   Tone_000/120_Guitar_Fret_Noise.pat 
- 122   Tone_000/122_Seashore.pat 
- 125   Tone_000/125_Helicopter.pat 
+ 1     Tone_000/001_Acoustic_Brite_Piano.pat
+ 2     Tone_000/002_Electric_Grand_Piano.pat
+ 4     Tone_000/004_Electric_Piano_1_Rhodes.pat
+ 5     Tone_000/005_Electric_Piano_2_Chorused_Yamaha_DX.pat
+ 6     Tone_000/006_Harpsichord.pat
+ 7     Tone_000/007_Clavinet.pat
+ 8     Tone_000/008_Celesta.pat
+ 9     Tone_000/009_Glockenspiel.pat
+ 13    Tone_000/013_Xylophone.pat
+ 14    Tone_000/014_Tubular_Bells.pat
+ 15    Tone_000/015_Dulcimer.pat
+ 16    Tone_000/016_Hammond_Organ.pat
+ 19    Tone_000/019_Church_Organ.pat
+ 21    Tone_000/021_Accordion.pat
+ 23    Tone_000/023_Tango_Accordion.pat
+ 24    Tone_000/024_Nylon_Guitar.pat
+ 25    Tone_000/025_Steel_Guitar.pat
+ 26    Tone_000/026_Jazz_Guitar.pat
+ 27    Tone_000/027_Clean_Electric_Guitar.pat
+ 28    Tone_000/028_Muted_Electric_Guitar.pat
+ 29    Tone_000/029_Overdriven_Guitar.pat
+ 30    Tone_000/030_Distortion_Guitar.pat
+ 32    Tone_000/032_Acoustic_Bass.pat
+ 33    Tone_000/033_Finger_Bass.pat
+ 34    Tone_000/034_Pick_Bass.pat
+ 35    Tone_000/035_Fretless_Bass.pat
+ 36    Tone_000/036_Slap_Bass_1.pat
+ 37    Tone_000/037_Slap_Bass_2.pat
+ 38    Tone_000/038_Synth_Bass_1.pat
+ 40    Tone_000/040_Violin.pat
+ 42    Tone_000/042_Cello.pat
+ 44    Tone_000/044_Tremolo_Strings.pat
+ 45    Tone_000/045_Pizzicato_Strings.pat
+ 46    Tone_000/046_Harp.pat
+ 47    Tone_000/047_Timpani.pat
+ 48    Tone_000/048_String_Ensemble_1_Marcato.pat
+ 53    Tone_000/053_Voice_Oohs.pat
+ 56    Tone_000/056_Trumpet.pat
+ 57    Tone_000/057_Trombone.pat
+ 58    Tone_000/058_Tuba.pat
+ 59    Tone_000/059_Muted_Trumpet.pat
+ 60    Tone_000/060_French_Horn.pat
+ 61    Tone_000/061_Brass_Section.pat
+ 64    Tone_000/064_Soprano_Sax.pat
+ 65    Tone_000/065_Alto_Sax.pat
+ 66    Tone_000/066_Tenor_Sax.pat
+ 67    Tone_000/067_Baritone_Sax.pat
+ 68    Tone_000/068_Oboe.pat
+ 69    Tone_000/069_English_Horn.pat
+ 70    Tone_000/070_Bassoon.pat
+ 71    Tone_000/071_Clarinet.pat
+ 72    Tone_000/072_Piccolo.pat
+ 73    Tone_000/073_Flute.pat
+ 74    Tone_000/074_Recorder.pat
+ 75    Tone_000/075_Pan_Flute.pat
+ 76    Tone_000/076_Bottle_Blow.pat
+ 79    Tone_000/079_Ocarina.pat
+ 80    Tone_000/080_Square_Wave.pat
+ 84    Tone_000/084_Charang.pat
+ 88    Tone_000/088_New_Age.pat
+ 94    Tone_000/094_Halo_Pad.pat
+ 95    Tone_000/095_Sweep_Pad.pat
+ 98    Tone_000/098_Crystal.pat
+ 101   Tone_000/101_Goblins--Unicorn.pat
+ 102   Tone_000/102_Echo_Voice.pat
+ 104   Tone_000/104_Sitar.pat
+ 114   Tone_000/114_Steel_Drums.pat
+ 115   Tone_000/115_Wood_Block.pat
+ 120   Tone_000/120_Guitar_Fret_Noise.pat
+ 122   Tone_000/122_Seashore.pat
+ 125   Tone_000/125_Helicopter.pat
  
diff --git a/wireshark/init.lua b/wireshark/init.lua

index 140cc431fb42c12893209e4bf9363473f711bfdc..0931c9b8b760b970b8bb230a91fa0803d6f1fd07 100644 (file)
--- a/wireshark/init.lua
+++ b/wireshark/init.lua
@@ -109,7 +109,7 @@ function package.prepend_path(name)
      package.path = name .. sep .. "?.lua;" .. package.path
  end
  
--- -- Wiretap encapsulations XXX
+-- Wiretap encapsulations XXX
  wtap_encaps = {
         ["PER_PACKET"] = -1,
         ["UNKNOWN"] = 0,
@@ -293,12 +293,14 @@ wtap_encaps = {
         ["GFP_T"] = 178,
         ["GFP_F"] = 179,
         ["IP_OVER_IB_PCAP"] = 180,
-       ["JUNIPER_VN"] = 181
+       ["JUNIPER_VN"] = 181,
+       ["USB_DARWIN"] = 182,
+       ["NORDIC_BLE"] = 183
  }
  wtap = wtap_encaps -- for bw compatibility
  
  
--- -- Wiretap file types
+-- Wiretap file types
  wtap_filetypes = {
         ["UNKNOWN"] = 0,
         ["PCAP"] = 1,
@@ -387,7 +389,7 @@ wtap_filetypes = {
  }
  
  
--- -- Wiretap timestamp precision types
+-- Wiretap timestamp precision types
  wtap_tsprecs = {
         ["SEC"] = 0,
         ["DSEC"] = 1,
@@ -398,7 +400,7 @@ wtap_tsprecs = {
  }
  
  
--- -- Wiretap file comment types
+-- Wiretap file comment types
  wtap_comments = {
         ["PER_SECTION"] = 0x00000001,
         ["PER_INTERFACE"] = 0x00000002,
@@ -406,58 +408,59 @@ wtap_comments = {
  }
  
  
---  -- Field Types
+-- Field Types
  ftypes = {
         ["NONE"] = 0,
         ["PROTOCOL"] = 1,
         ["BOOLEAN"] = 2,
-       ["UINT8"] = 3,
-       ["UINT16"] = 4,
-       ["UINT24"] = 5,
-       ["UINT32"] = 6,
-       ["UINT40"] = 7,
-       ["UINT48"] = 8,
-       ["UINT56"] = 9,
-       ["UINT64"] = 10,
-       ["INT8"] = 11,
-       ["INT16"] = 12,
-       ["INT24"] = 13,
-       ["INT32"] = 14,
-       ["INT40"] = 15,
-       ["INT48"] = 16,
-       ["INT56"] = 17,
-       ["INT64"] = 18,
-       ["IEEE_11073_SFLOAT"] = 19,
-       ["IEEE_11073_FLOAT"] = 20,
-       ["FLOAT"] = 21,
-       ["DOUBLE"] = 22,
-       ["ABSOLUTE_TIME"] = 23,
-       ["RELATIVE_TIME"] = 24,
-       ["STRING"] = 25,
-       ["STRINGZ"] = 26,
-       ["UINT_STRING"] = 27,
-       ["ETHER"] = 28,
-       ["BYTES"] = 29,
-       ["UINT_BYTES"] = 30,
-       ["IPv4"] = 31,
-       ["IPv6"] = 32,
-       ["IPXNET"] = 33,
-       ["FRAMENUM"] = 34,
-       ["PCRE"] = 35,
-       ["GUID"] = 36,
-       ["OID"] = 37,
-       ["EUI64"] = 38,
-       ["AX25"] = 39,
-       ["VINES"] = 40,
-       ["REL_OID"] = 41,
-       ["SYSTEM_ID"] = 42,
-       ["STRINGZPAD"] = 43,
-       ["FCWWN"] = 44
+       ["CHAR"] = 3,
+       ["UINT8"] = 4,
+       ["UINT16"] = 5,
+       ["UINT24"] = 6,
+       ["UINT32"] = 7,
+       ["UINT40"] = 8,
+       ["UINT48"] = 9,
+       ["UINT56"] = 10,
+       ["UINT64"] = 11,
+       ["INT8"] = 12,
+       ["INT16"] = 13,
+       ["INT24"] = 14,
+       ["INT32"] = 15,
+       ["INT40"] = 16,
+       ["INT48"] = 17,
+       ["INT56"] = 18,
+       ["INT64"] = 19,
+       ["IEEE_11073_SFLOAT"] = 20,
+       ["IEEE_11073_FLOAT"] = 21,
+       ["FLOAT"] = 22,
+       ["DOUBLE"] = 23,
+       ["ABSOLUTE_TIME"] = 24,
+       ["RELATIVE_TIME"] = 25,
+       ["STRING"] = 26,
+       ["STRINGZ"] = 27,
+       ["UINT_STRING"] = 28,
+       ["ETHER"] = 29,
+       ["BYTES"] = 30,
+       ["UINT_BYTES"] = 31,
+       ["IPv4"] = 32,
+       ["IPv6"] = 33,
+       ["IPXNET"] = 34,
+       ["FRAMENUM"] = 35,
+       ["PCRE"] = 36,
+       ["GUID"] = 37,
+       ["OID"] = 38,
+       ["EUI64"] = 39,
+       ["AX25"] = 40,
+       ["VINES"] = 41,
+       ["REL_OID"] = 42,
+       ["SYSTEM_ID"] = 43,
+       ["STRINGZPAD"] = 44,
+       ["FCWWN"] = 45
  }
  
  
  -- the following table is since 2.0
---  -- Field Type FRAMENUM Types
+-- Field Type FRAMENUM Types
  frametype = {
         ["NONE"] = 0,
         ["REQUEST"] = 1,
@@ -468,7 +471,7 @@ frametype = {
  
  
  -- the following table is since 1.12
--- -- Wiretap record_types
+-- Wiretap record_types
  wtap_rec_types = {
         ["PACKET"] = 0,  -- packet 
         ["FT_SPECIFIC_EVENT"] = 1,  -- file-type-specific event 
@@ -478,7 +481,7 @@ wtap_rec_types = {
  
  
  -- the following table is since 1.11.3
--- -- Wiretap presence flags
+-- Wiretap presence flags
  wtap_presence_flags = {
         ["TS"] = 1,  -- time stamp 
         ["CAP_LEN"] = 2,  -- captured length separate from on-the-network length 
@@ -489,31 +492,47 @@ wtap_presence_flags = {
  }
  
  
--- -- Display Bases
- base = {
-       ["NONE"] = 0,
-       ["DEC"] = 1,
-       ["HEX"] = 2,
-       ["OCT"] = 3,
-       ["DEC_HEX"] = 4,
-       ["HEX_DEC"] = 5,
-       ["CUSTOM"] = 6,
-       ["NETMASK"] = 12,
-       ["PT_UDP"] = 13,
-       ["PT_TCP"] = 14,
-       ["PT_DCCP"] = 15,
-       ["PT_SCTP"] = 16,
+-- Display Bases
+base = {
+       ["NONE"] = 0,  -- none
+       ["DEC"] = 1,  -- decimal
+       ["HEX"] = 2,  -- hexadecimal
+       ["OCT"] = 3,  -- octal
+       ["DEC_HEX"] = 4,  -- decimal (hexadecimal)
+       ["HEX_DEC"] = 5,  -- hexadecimal (decimal)
+       ["CUSTOM"] = 6,  -- call custom routine (in ->strings) to format
+       ["ASCII"] = 0,  -- shows non-printable ASCII characters as C-style escapes
+       ["UNICODE"] = 7,  -- shows non-printable UNICODE characters as \\uXXXX (XXX for now non-printable characters display depends on UI)
+       ["DOT"] = 8,  -- hexadecimal bytes with a period (.) between each byte
+       ["DASH"] = 9,  -- hexadecimal bytes with a dash (-) between each byte
+       ["COLON"] = 10,  -- hexadecimal bytes with a colon (:) between each byte
+       ["SPACE"] = 11,  -- hexadecimal bytes with a space between each byte
+       ["NETMASK"] = 12,  -- Used for IPv4 address that shouldn't be resolved (like for netmasks)
+       ["PT_UDP"] = 13,  -- UDP port
+       ["PT_TCP"] = 14,  -- TCP port
+       ["PT_DCCP"] = 15,  -- DCCP port
+       ["PT_SCTP"] = 16,  -- SCTP port
+       ["UNIT_STRING"] = 4096,  -- Add unit text to the field value
+       ["LOCAL"] = 1000,  -- local time in our time zone, with month and day
+       ["UTC"] = 1001,  -- UTC, with month and day
+       ["DOY_UTC"] = 1002,  -- UTC, with 1-origin day-of-year
  }
  
  
-
--- -- Encodings
+-- Encodings
  ENC_BIG_ENDIAN = 0
  ENC_LITTLE_ENDIAN = 2147483648
  ENC_TIME_TIMESPEC = 0
  ENC_TIME_NTP = 2
  ENC_TIME_TOD = 4
-ENC_TIME_NTP_BASE_ZERO = 8
+ENC_TIME_RTPS = 8
+ENC_TIME_NTP_BASE_ZERO = 14
+ENC_TIME_TIMEVAL = 16
+ENC_TIME_SECS = 18
+ENC_TIME_MSECS = 20
+ENC_TIME_SECS_NTP = 24
+ENC_TIME_RFC_3971 = 32
+ENC_TIME_MSEC_NTP = 34
  ENC_CHARENCODING_MASK = 2147483646
  ENC_ASCII = 0
  ENC_UTF_8 = 2
@@ -541,6 +560,8 @@ ENC_EBCDIC = 46
  ENC_MAC_ROMAN = 48
  ENC_CP437 = 50
  ENC_ASCII_7BITS = 52
+ENC_T61 = 54
+ENC_EBCDIC_CP037 = 56
  ENC_NA = 0
  ENC_STR_NUM = 16777216
  ENC_STR_HEX = 33554432
@@ -562,8 +583,7 @@ ENC_STR_TIME_MASK = 983040
  
  
  
-
--- -- Expert flags and facilities (deprecated - see 'expert' table below)
+-- Expert flags and facilities (deprecated - see 'expert' table below)
  PI_SEVERITY_MASK = 15728640
  PI_COMMENT = 1048576
  PI_CHAT = 2097152
@@ -584,11 +604,12 @@ PI_SECURITY = 167772160
  PI_COMMENTS_GROUP = 184549376
  PI_DECRYPTION = 201326592
  PI_ASSUMPTION = 218103808
+PI_DEPRECATED = 234881024
  
  
  
  -- the following table is since 1.11.3
--- -- Expert flags and facilities
+-- Expert flags and facilities
  expert = {
         -- Expert event groups
         group = {
@@ -618,6 +639,8 @@ expert = {
                 ["DECRYPTION"] = 201326592,
                 -- The protocol field has incomplete data, decode based on assumed value
                 ["ASSUMPTION"] = 218103808,
+               -- The protocol field has been deprecated, usually PI_NOTE severity
+               ["DEPRECATED"] = 234881024,
         },
         -- Expert severity levels
         severity = {
@@ -636,7 +659,7 @@ expert = {
  
  
  
--- -- menu groups for register_menu
+-- menu groups for register_menu
  MENU_ANALYZE_UNSORTED = 0
  MENU_ANALYZE_CONVERSATION = 1
  MENU_STAT_UNSORTED = 2
diff --git a/xdg/autostart/caribou-autostart.desktop b/xdg/autostart/caribou-autostart.desktop

index b78e2eeffcb13210bc83a301ed24f52405a19ce7..06eaf9ba4db660a062573b16bb59f60e53f9d547 100644 (file)
--- a/xdg/autostart/caribou-autostart.desktop
+++ b/xdg/autostart/caribou-autostart.desktop
@@ -5,5 +5,6 @@ Exec=/usr/lib/caribou/caribou
  AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled
  X-GNOME-AutoRestart=true
  #X-GNOME-Autostart-Phase=Initialization
+NoDisplay=true
  OnlyShowIn=GNOME;Unity;
  X-Ubuntu-Gettext-Domain=caribou
diff --git a/xdg/autostart/polkit-gnome-authentication-agent-1.desktop b/xdg/autostart/polkit-gnome-authentication-agent-1.desktop

index 2051d759e481e3a64989887f3ec56f740d7f03ed..2dc931b08b89c1b67c1e7d8c1cd5b7e861e6bc21 100644 (file)
--- a/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
+++ b/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
@@ -6,7 +6,7 @@ Terminal=false
  Type=Application
  Categories=
  NoDisplay=true
-OnlyShowIn=GNOME;XFCE;Unity;
+OnlyShowIn=XFCE;Unity;X-Cinnamon;
  X-GNOME-AutoRestart=true
  AutostartCondition=GNOME3 unless-session gnome
  X-Ubuntu-Gettext-Domain=polkit-gnome-1
diff --git a/xdg/autostart/user-dirs-update-gtk.desktop b/xdg/autostart/user-dirs-update-gtk.desktop

index cd4eff0e6ff393c29fff4ac5808835651d619ebc..ccad507811401f487478c6ffa653651e262704e1 100644 (file)
--- a/xdg/autostart/user-dirs-update-gtk.desktop
+++ b/xdg/autostart/user-dirs-update-gtk.desktop
@@ -4,9 +4,9 @@ Exec=xdg-user-dirs-gtk-update
  Name=User folders update
  Comment=Update common folders names to match current locale
  Terminal=false
-OnlyShowIn=GNOME;LXDE;Unity;
+NotShowIn=KDE;LXQt;
+NoDisplay=true
  Type=Application
  StartupNotify=false
  X-KDE-autostart-after=panel
-NoDisplay=true
  X-Ubuntu-Gettext-Domain=xdg-user-dirs-gtk
diff --git a/xdg/autostart/xdg-user-dirs.desktop b/xdg/autostart/xdg-user-dirs.desktop

new file mode 100644 (file)

index 0000000..987511d
--- /dev/null
+++ b/xdg/autostart/xdg-user-dirs.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=User folders update
+TryExec=xdg-user-dirs-update
+Exec=xdg-user-dirs-update
+StartupNotify=false
+NoDisplay=true
+X-Ubuntu-Gettext-Domain=xdg-user-dirs
+
+X-GNOME-Autostart-Phase=Initialization
+X-KDE-autostart-phase=1
diff --git a/xdg/autostart/zeitgeist-datahub.desktop b/xdg/autostart/zeitgeist-datahub.desktop

index aa1183cc5e573d6272a29834904e7ac144f2c575..daccad1bc93e2e741aafa4918e346b3823d4e2e1 100644 (file)
--- a/xdg/autostart/zeitgeist-datahub.desktop
+++ b/xdg/autostart/zeitgeist-datahub.desktop
@@ -1,12 +1,8 @@
  [Desktop Entry]
-Version=1.0
-Encoding=UTF-8
  Name=Zeitgeist Datahub
  Comment=Start the Zeitgeist Datahub for passive loggers
  Exec=zeitgeist-datahub
  Terminal=false
  Type=Application
-Categories=
-GenericName=
  X-GNOME-Autostart-Delay=20
  NoDisplay=true
diff --git a/xdg/menus/gnome-applications.menu b/xdg/menus/gnome-applications.menu

index 602005c12e7945b5499c687765f90973d5188818..3a70e20244ab4efcd9cb4ebd3f1abc2910528adc 100644 (file)
--- a/xdg/menus/gnome-applications.menu
+++ b/xdg/menus/gnome-applications.menu
@@ -548,7 +548,7 @@
     </Layout>
  
  <Include>
-  <Filename>ubuntu-software-center.desktop</Filename>
+  <Filename>org.gnome.Software.desktop</Filename>
  </Include>
  
  <!-- Separator between menus and gnome-app-install -->
@@ -556,7 +556,7 @@
    <Merge type="menus"/>
    <Merge type="files"/>
    <Separator/>
-  <Filename>ubuntu-software-center.desktop</Filename>
+  <Filename>org.gnome.Software.desktop</Filename>
  </Layout>
  
  </Menu> <!-- End Applications -->
diff --git a/xml/catalog b/xml/catalog

index c9768b781dbe47928ada202ceec09de882a462fd..c7f72aa28318801635bd1daefd8a180f1d854d31 100644 (file)
--- a/xml/catalog
+++ b/xml/catalog
@@ -2,8 +2,8 @@
  <!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
    "file:///usr/share/xml/schema/xml-core/catalog.dtd">
  <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-<delegatePublic publicIdStartString="-//OASIS//DTD XML Catalogs V1.0//EN" catalog="file:///etc/xml/xml-core.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" catalog="file:///etc/xml/xml-core.xml"/>
  <delegatePublic publicIdStartString="-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" catalog="file:///etc/xml/xml-core.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//DTD XML Catalogs V1.0//EN" catalog="file:///etc/xml/xml-core.xml"/>
  <delegateSystem systemIdStartString="http://globaltranscorp.org/oasis/catalog/xml/tr9401.dtd" catalog="file:///etc/xml/xml-core.xml"/>
+<delegateSystem systemIdStartString="http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" catalog="file:///etc/xml/xml-core.xml"/>
  </catalog>
diff --git a/xml/xml-core.xml b/xml/xml-core.xml

index 5505826d81556bfe5efc0bc4f3afa8315f7ec58d..90943c2923824f47f9709e5d0989a3c12f9eb4f3 100644 (file)
--- a/xml/xml-core.xml
+++ b/xml/xml-core.xml
@@ -2,8 +2,8 @@
  <!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
    "file:///usr/share/xml/schema/xml-core/catalog.dtd">
  <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-<delegateSystem systemIdStartString="http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" catalog="file:///usr/share/xml/schema/xml-core/catalog.xml"/>
+<delegatePublic publicIdStartString="-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" catalog="file:///usr/share/xml/schema/xml-core/catalog.xml"/>
  <delegatePublic publicIdStartString="-//OASIS//DTD XML Catalogs V1.0//EN" catalog="file:///usr/share/xml/schema/xml-core/catalog.xml"/>
  <delegateSystem systemIdStartString="http://globaltranscorp.org/oasis/catalog/xml/tr9401.dtd" catalog="file:///usr/share/xml/schema/xml-core/catalog.xml"/>
-<delegatePublic publicIdStartString="-//GlobalTransCorp//DTD XML Catalogs V1.0-Based Extension V1.0//EN" catalog="file:///usr/share/xml/schema/xml-core/catalog.xml"/>
+<delegateSystem systemIdStartString="http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd" catalog="file:///usr/share/xml/schema/xml-core/catalog.xml"/>
  </catalog>
author	root <root@localhost>
	Fri, 24 Aug 2018 13:24:22 +0000 (15:24 +0200)
committer	root <root@localhost>
	Fri, 24 Aug 2018 13:24:22 +0000 (15:24 +0200)