committing changes in /etc made by "apt-get upgrade -fyq -o Dpkg::Options::=--force...

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

Tue, 21 Jul 2020 09:37:13 +0000 (11:37 +0200)

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

Tue, 21 Jul 2020 09:37:13 +0000 (11:37 +0200)
author Frank Brehm <frank@brehm-online.com>
Tue, 21 Jul 2020 09:37:13 +0000 (11:37 +0200)
committer Frank Brehm <frank@brehm-online.com>
Tue, 21 Jul 2020 09:37:13 +0000 (11:37 +0200)
diff --git a/.etckeeper b/.etckeeper

index 8d302ddcc1efa9d7d1bd671a2f97d392f38a4fc2..7df2076c0c45c05fdb723a7f8921ccfda5c4758c 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -7,6 +7,7 @@ mkdir -p './NetworkManager/dnsmasq-shared.d'
  mkdir -p './NetworkManager/dnsmasq.d'
  mkdir -p './ODBCDataSources'
  mkdir -p './X11/xkb'
+mkdir -p './apm/event.d'
  mkdir -p './apparmor.d/force-complain'
  mkdir -p './apt/auth.conf.d'
  mkdir -p './avahi/services'
@@ -38,6 +39,8 @@ mkdir -p './mate-settings-daemon/xrandr'
  mkdir -p './molly-guard/messages.d'
  mkdir -p './mono/certstore'
  mkdir -p './network/interfaces.d'
+mkdir -p './networkd-dispatcher/carrier.d'
+mkdir -p './networkd-dispatcher/degraded.d'
  mkdir -p './networkd-dispatcher/dormant.d'
  mkdir -p './networkd-dispatcher/no-carrier.d'
  mkdir -p './networkd-dispatcher/off.d'
@@ -55,6 +58,7 @@ mkdir -p './polkit-1/localauthority/50-local.d'
  mkdir -p './polkit-1/localauthority/90-mandatory.d'
  mkdir -p './postfix/dynamicmaps.cf.d'
  mkdir -p './postfix/sasl'
+mkdir -p './powerline'
  mkdir -p './ppp/ipv6-down.d'
  mkdir -p './ppp/ipv6-up.d'
  mkdir -p './ppp/resolv'
@@ -63,7 +67,6 @@ mkdir -p './security/limits.d'
  mkdir -p './security/namespace.d'
  mkdir -p './smartmontools/smartd_warning.d'
  mkdir -p './systemd/network'
-mkdir -p './systemd/user'
  mkdir -p './udev/hwdb.d'
  mkdir -p './update-manager/release-upgrades.d'
  mkdir -p './update-notifier'
@@ -88,6 +91,7 @@ maybe chmod 0644 'ImageMagick-6/thresholds.xml'
  maybe chmod 0644 'ImageMagick-6/type-apple.xml'
  maybe chmod 0644 'ImageMagick-6/type-dejavu.xml'
  maybe chmod 0644 'ImageMagick-6/type-ghostscript.xml'
+maybe chmod 0644 'ImageMagick-6/type-urw-base35.xml'
  maybe chmod 0644 'ImageMagick-6/type-windows.xml'
  maybe chmod 0644 'ImageMagick-6/type.xml'
  maybe chmod 0755 'NetworkManager'
@@ -130,6 +134,7 @@ maybe chmod 0644 'X11/Xsession.d/35x11-common_xhost-local'
  maybe chmod 0644 'X11/Xsession.d/40x11-common_xsessionrc'
  maybe chmod 0644 'X11/Xsession.d/50x11-common_determine-startup'
  maybe chmod 0644 'X11/Xsession.d/55gnome-session_gnomerc'
+maybe chmod 0644 'X11/Xsession.d/55mate-session_materc'
  maybe chmod 0644 'X11/Xsession.d/55numlockx'
  maybe chmod 0644 'X11/Xsession.d/60x11-common_localhost'
  maybe chmod 0644 'X11/Xsession.d/60x11-common_xdg_path'
@@ -230,8 +235,6 @@ maybe chmod 0644 'apache2/mods-available/dnssd.load'
  maybe chmod 0644 'apg.conf'
  maybe chmod 0755 'apm'
  maybe chmod 0755 'apm/event.d'
-maybe chmod 0755 'apm/event.d/20hdparm'
-maybe chmod 0755 'apm/event.d/anacron'
  maybe chmod 0755 'apm/resume.d'
  maybe chmod 0755 'apm/scripts.d'
  maybe chmod 0755 'apm/scripts.d/alsa'
@@ -262,6 +265,8 @@ maybe chmod 0644 'apparmor.d/abstractions/dbus-session-strict'
  maybe chmod 0644 'apparmor.d/abstractions/dbus-strict'
  maybe chmod 0644 'apparmor.d/abstractions/dconf'
  maybe chmod 0644 'apparmor.d/abstractions/dovecot-common'
+maybe chmod 0644 'apparmor.d/abstractions/dri-common'
+maybe chmod 0644 'apparmor.d/abstractions/dri-enumerate'
  maybe chmod 0644 'apparmor.d/abstractions/enchant'
  maybe chmod 0644 'apparmor.d/abstractions/evince'
  maybe chmod 0644 'apparmor.d/abstractions/fcitx'
@@ -272,8 +277,10 @@ maybe chmod 0644 'apparmor.d/abstractions/gnome'
  maybe chmod 0644 'apparmor.d/abstractions/gnupg'
  maybe chmod 0644 'apparmor.d/abstractions/ibus'
  maybe chmod 0644 'apparmor.d/abstractions/kde'
+maybe chmod 0644 'apparmor.d/abstractions/kde-globals-write'
+maybe chmod 0644 'apparmor.d/abstractions/kde-icon-cache-write'
+maybe chmod 0644 'apparmor.d/abstractions/kde-language-write'
  maybe chmod 0644 'apparmor.d/abstractions/kerberosclient'
-maybe chmod 0644 'apparmor.d/abstractions/launchpad-integration'
  maybe chmod 0644 'apparmor.d/abstractions/ldapclient'
  maybe chmod 0644 'apparmor.d/abstractions/libpam-systemd'
  maybe chmod 0644 'apparmor.d/abstractions/libvirt-lxc'
@@ -282,12 +289,19 @@ maybe chmod 0644 'apparmor.d/abstractions/lightdm'
  maybe chmod 0644 'apparmor.d/abstractions/lightdm_chromium-browser'
  maybe chmod 0644 'apparmor.d/abstractions/likewise'
  maybe chmod 0644 'apparmor.d/abstractions/mdns'
+maybe chmod 0644 'apparmor.d/abstractions/mesa'
  maybe chmod 0644 'apparmor.d/abstractions/mir'
  maybe chmod 0644 'apparmor.d/abstractions/mozc'
  maybe chmod 0644 'apparmor.d/abstractions/mysql'
  maybe chmod 0644 'apparmor.d/abstractions/nameservice'
  maybe chmod 0644 'apparmor.d/abstractions/nis'
  maybe chmod 0644 'apparmor.d/abstractions/nvidia'
+maybe chmod 0644 'apparmor.d/abstractions/opencl'
+maybe chmod 0644 'apparmor.d/abstractions/opencl-common'
+maybe chmod 0644 'apparmor.d/abstractions/opencl-intel'
+maybe chmod 0644 'apparmor.d/abstractions/opencl-mesa'
+maybe chmod 0644 'apparmor.d/abstractions/opencl-nvidia'
+maybe chmod 0644 'apparmor.d/abstractions/opencl-pocl'
  maybe chmod 0644 'apparmor.d/abstractions/openssl'
  maybe chmod 0644 'apparmor.d/abstractions/orbit2'
  maybe chmod 0644 'apparmor.d/abstractions/p11-kit'
@@ -298,6 +312,10 @@ maybe chmod 0644 'apparmor.d/abstractions/postfix-common'
  maybe chmod 0644 'apparmor.d/abstractions/private-files'
  maybe chmod 0644 'apparmor.d/abstractions/private-files-strict'
  maybe chmod 0644 'apparmor.d/abstractions/python'
+maybe chmod 0644 'apparmor.d/abstractions/qt5'
+maybe chmod 0644 'apparmor.d/abstractions/qt5-compose-cache-write'
+maybe chmod 0644 'apparmor.d/abstractions/qt5-settings-write'
+maybe chmod 0644 'apparmor.d/abstractions/recent-documents-write'
  maybe chmod 0644 'apparmor.d/abstractions/ruby'
  maybe chmod 0644 'apparmor.d/abstractions/samba'
  maybe chmod 0644 'apparmor.d/abstractions/smbpass'
@@ -337,6 +355,7 @@ maybe chmod 0644 'apparmor.d/abstractions/user-manpages'
  maybe chmod 0644 'apparmor.d/abstractions/user-tmp'
  maybe chmod 0644 'apparmor.d/abstractions/user-write'
  maybe chmod 0644 'apparmor.d/abstractions/video'
+maybe chmod 0644 'apparmor.d/abstractions/vulkan'
  maybe chmod 0644 'apparmor.d/abstractions/wayland'
  maybe chmod 0644 'apparmor.d/abstractions/web-data'
  maybe chmod 0644 'apparmor.d/abstractions/winbind'
@@ -346,7 +365,6 @@ maybe chmod 0644 'apparmor.d/abstractions/xdg-desktop'
  maybe chmod 0755 'apparmor.d/apache2.d'
  maybe chmod 0644 'apparmor.d/apache2.d/phpsysinfo'
  maybe chmod 0644 'apparmor.d/bin.ping'
-maybe chmod 0755 'apparmor.d/cache'
  maybe chmod 0755 'apparmor.d/disable'
  maybe chmod 0755 'apparmor.d/force-complain'
  maybe chmod 0755 'apparmor.d/libvirt'
@@ -356,6 +374,8 @@ maybe chmod 0644 'apparmor.d/lightdm-guest-session'
  maybe chmod 0755 'apparmor.d/local'
  maybe chmod 0644 'apparmor.d/local/README'
  maybe chmod 0644 'apparmor.d/local/bin.ping'
+maybe chmod 0644 'apparmor.d/local/lsb_release'
+maybe chmod 0644 'apparmor.d/local/nvidia_modprobe'
  maybe chmod 0644 'apparmor.d/local/sbin.dhclient'
  maybe chmod 0644 'apparmor.d/local/sbin.klogd'
  maybe chmod 0644 'apparmor.d/local/sbin.syslog-ng'
@@ -404,6 +424,8 @@ maybe chmod 0644 'apparmor.d/local/usr.sbin.smbd'
  maybe chmod 0644 'apparmor.d/local/usr.sbin.smbldap-useradd'
  maybe chmod 0644 'apparmor.d/local/usr.sbin.tcpdump'
  maybe chmod 0644 'apparmor.d/local/usr.sbin.traceroute'
+maybe chmod 0644 'apparmor.d/lsb_release'
+maybe chmod 0644 'apparmor.d/nvidia_modprobe'
  maybe chmod 0644 'apparmor.d/sbin.dhclient'
  maybe chmod 0644 'apparmor.d/sbin.klogd'
  maybe chmod 0644 'apparmor.d/sbin.syslog-ng'
@@ -423,6 +445,7 @@ maybe chmod 0755 'apparmor.d/tunables/multiarch.d'
  maybe chmod 0644 'apparmor.d/tunables/multiarch.d/site.local'
  maybe chmod 0644 'apparmor.d/tunables/proc'
  maybe chmod 0644 'apparmor.d/tunables/securityfs'
+maybe chmod 0644 'apparmor.d/tunables/share'
  maybe chmod 0644 'apparmor.d/tunables/sys'
  maybe chmod 0644 'apparmor.d/tunables/xdg-user-dirs'
  maybe chmod 0755 'apparmor.d/tunables/xdg-user-dirs.d'
@@ -431,22 +454,6 @@ maybe chmod 0644 'apparmor.d/usr.bin.chromium-browser'
  maybe chmod 0644 'apparmor.d/usr.bin.evince'
  maybe chmod 0644 'apparmor.d/usr.bin.firefox'
  maybe chmod 0644 'apparmor.d/usr.bin.man'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.anvil'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.auth'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.config'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.deliver'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.dict'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.dovecot-auth'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.dovecot-lda'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.imap'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.imap-login'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.lmtp'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.log'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.managesieve'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.managesieve-login'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.pop3'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.pop3-login'
-maybe chmod 0644 'apparmor.d/usr.lib.dovecot.ssl-params'
  maybe chmod 0644 'apparmor.d/usr.lib.libreoffice.program.oosplash'
  maybe chmod 0644 'apparmor.d/usr.lib.libreoffice.program.senddoc'
  maybe chmod 0644 'apparmor.d/usr.lib.libreoffice.program.soffice.bin'
@@ -458,7 +465,6 @@ maybe chmod 0644 'apparmor.d/usr.sbin.chronyd'
  maybe chmod 0644 'apparmor.d/usr.sbin.cups-browsed'
  maybe chmod 0644 'apparmor.d/usr.sbin.cupsd'
  maybe chmod 0644 'apparmor.d/usr.sbin.dnsmasq'
-maybe chmod 0644 'apparmor.d/usr.sbin.dovecot'
  maybe chmod 0644 'apparmor.d/usr.sbin.identd'
  maybe chmod 0644 'apparmor.d/usr.sbin.ippusbxd'
  maybe chmod 0644 'apparmor.d/usr.sbin.libvirtd'
@@ -477,7 +483,6 @@ maybe chmod 0755 'apparmor/init/network-interface-security'
  maybe chmod 0644 'apparmor/logprof.conf'
  maybe chmod 0644 'apparmor/parser.conf'
  maybe chmod 0644 'apparmor/severity.db'
-maybe chmod 0644 'apparmor/subdomain.conf'
  maybe chmod 0755 'apport'
  maybe chmod 0755 'apport/blacklist.d'
  maybe chmod 0644 'apport/blacklist.d/README.blacklist'
@@ -519,6 +524,7 @@ maybe chmod 0644 'apt/google.gpg-key2.pub'
  maybe chmod 0644 'apt/launchpad-ppa.ubuntu-webupd8team.gpg-key2.pub'
  maybe chmod 0644 'apt/plex.gpg-key2.pub'
  maybe chmod 0755 'apt/preferences.d'
+maybe chmod 0644 'apt/preferences.d/nosnap.pref'
  maybe chmod 0644 'apt/preferences.d/official-extra-repositories.pref'
  maybe chmod 0644 'apt/preferences.d/official-package-repositories.pref'
  maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key2.pub'
@@ -1121,7 +1127,6 @@ maybe chmod 0755 'cron.daily/mdadm'
  maybe chmod 0755 'cron.daily/mlocate'
  maybe chmod 0755 'cron.daily/passwd'
  maybe chmod 0755 'cron.daily/samba'
-maybe chmod 0755 'cron.daily/ubuntu-advantage-tools'
  maybe chmod 0755 'cron.daily/update-notifier-common'
  maybe chmod 0755 'cron.hourly'
  maybe chmod 0644 'cron.hourly/.placeholder'
@@ -1227,8 +1232,6 @@ maybe chmod 0644 'dbus-1/system.d/gdm.conf'
  maybe chmod 0644 'dbus-1/system.d/kerneloops.conf'
  maybe chmod 0644 'dbus-1/system.d/net.hadess.SensorProxy.conf'
  maybe chmod 0644 'dbus-1/system.d/nm-dispatcher.conf'
-maybe chmod 0644 'dbus-1/system.d/nm-openvpn-service.conf'
-maybe chmod 0644 'dbus-1/system.d/nm-pptp-service.conf'
  maybe chmod 0644 'dbus-1/system.d/org.debian.apt.conf'
  maybe chmod 0644 'dbus-1/system.d/org.freedesktop.Accounts.conf'
  maybe chmod 0644 'dbus-1/system.d/org.freedesktop.ColorManager.conf'
@@ -1240,10 +1243,7 @@ maybe chmod 0644 'dbus-1/system.d/org.freedesktop.ModemManager1.conf'
  maybe chmod 0644 'dbus-1/system.d/org.freedesktop.NetworkManager.conf'
  maybe chmod 0644 'dbus-1/system.d/org.freedesktop.PackageKit.conf'
  maybe chmod 0644 'dbus-1/system.d/org.freedesktop.PolicyKit1.conf'
-maybe chmod 0644 'dbus-1/system.d/org.freedesktop.RealtimeKit1.conf'
  maybe chmod 0644 'dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf'
-maybe chmod 0644 'dbus-1/system.d/org.freedesktop.UDisks2.conf'
-maybe chmod 0644 'dbus-1/system.d/org.freedesktop.UPower.conf'
  maybe chmod 0644 'dbus-1/system.d/org.freedesktop.bolt.conf'
  maybe chmod 0644 'dbus-1/system.d/org.freedesktop.fwupd.conf'
  maybe chmod 0644 'dbus-1/system.d/org.freedesktop.thermald.conf'
@@ -1279,7 +1279,6 @@ maybe chmod 0644 'default/crda'
  maybe chmod 0644 'default/cron'
  maybe chmod 0644 'default/cryptdisks'
  maybe chmod 0644 'default/dbus'
-maybe chmod 0644 'default/ebtables'
  maybe chmod 0644 'default/g15daemon'
  maybe chmod 0644 'default/google-chrome'
  maybe chmod 0644 'default/grub'
@@ -1311,10 +1310,8 @@ maybe chmod 0644 'default/numlockx'
  maybe chmod 0644 'default/openvpn'
  maybe chmod 0644 'default/qemu-kvm'
  maybe chmod 0644 'default/rsync'
-maybe chmod 0644 'default/rsyslog'
  maybe chmod 0644 'default/saned'
  maybe chmod 0644 'default/smartmontools'
-maybe chmod 0644 'default/speech-dispatcher'
  maybe chmod 0644 'default/ssh'
  maybe chmod 0644 'default/ufw'
  maybe chmod 0644 'default/useradd'
@@ -1385,15 +1382,16 @@ maybe chmod 0644 'dpkg/shlibs.override'
  maybe chmod 0644 'dput.cf'
  maybe chmod 0755 'emacs'
  maybe chmod 0755 'emacs/site-start.d'
-maybe chmod 0644 'emacs/site-start.d/00debian-vars.el'
  maybe chmod 0644 'emacs/site-start.d/50autoconf.el'
  maybe chmod 0644 'emacs/site-start.d/50dictionaries-common.el'
  maybe chmod 0644 'emacs/site-start.d/50figlet.el'
  maybe chmod 0644 'emacs/site-start.d/50gnugo.el'
  maybe chmod 0644 'emacs/site-start.d/50gtk-doc-tools.el'
  maybe chmod 0644 'emacs/site-start.d/50systemtap-common.el'
-maybe chmod 0644 'emacs/site-start.el'
  maybe chmod 0644 'environment'
+maybe chmod 0755 'environment.d'
+maybe chmod 0644 'environment.d/90atk-adaptor.conf'
+maybe chmod 0644 'environment.d/90qt-a11y.conf'
  maybe chmod 0755 'etckeeper'
  maybe chmod 0755 'etckeeper/commit.d'
  maybe chmod 0755 'etckeeper/commit.d/10vcs-test'
@@ -1682,6 +1680,7 @@ maybe chmod 0644 'gufw/app_profiles/castle-combat.jhansonxi'
  maybe chmod 0644 'gufw/app_profiles/castle-vox.jhansonxi'
  maybe chmod 0644 'gufw/app_profiles/chat.ufw_app'
  maybe chmod 0644 'gufw/app_profiles/chocolatedoom.gufw'
+maybe chmod 0644 'gufw/app_profiles/chromecast.gufw'
  maybe chmod 0644 'gufw/app_profiles/clonk.jhansonxi'
  maybe chmod 0644 'gufw/app_profiles/comanche4.jhansonxi'
  maybe chmod 0644 'gufw/app_profiles/conquest.jhansonxi'
@@ -1767,6 +1766,7 @@ maybe chmod 0644 'gufw/app_profiles/kali.jhansonxi'
  maybe chmod 0644 'gufw/app_profiles/kde-connect.gufw'
  maybe chmod 0644 'gufw/app_profiles/kingpin-life-of-crime.jhansonxi'
  maybe chmod 0644 'gufw/app_profiles/knights-and-Merchants-the-shattered-kingdom.jhansonxi'
+maybe chmod 0644 'gufw/app_profiles/kodi_remote.gufw'
  maybe chmod 0644 'gufw/app_profiles/kohan-is.jhansonxi'
  maybe chmod 0644 'gufw/app_profiles/ktorrent.gufw_app'
  maybe chmod 0644 'gufw/app_profiles/lbreakout2.jhansonxi'
@@ -1823,6 +1823,7 @@ maybe chmod 0644 'gufw/app_profiles/printserver.ufw_app'
  maybe chmod 0644 'gufw/app_profiles/proxyserver.ufw_app'
  maybe chmod 0644 'gufw/app_profiles/pulseaudio.jhansonxi'
  maybe chmod 0644 'gufw/app_profiles/qbittorent.gufw_app'
+maybe chmod 0644 'gufw/app_profiles/qbittorrent.gufw_app'
  maybe chmod 0644 'gufw/app_profiles/quake.jhansonxi'
  maybe chmod 0644 'gufw/app_profiles/quake2.jhansonxi'
  maybe chmod 0644 'gufw/app_profiles/quake3.jhansonxi'
@@ -1951,7 +1952,6 @@ maybe chmod 0755 'init.d/cups'
  maybe chmod 0755 'init.d/cups-browsed'
  maybe chmod 0755 'init.d/dbus'
  maybe chmod 0755 'init.d/dns-clean'
-maybe chmod 0755 'init.d/ebtables'
  maybe chmod 0755 'init.d/g15daemon'
  maybe chmod 0755 'init.d/gdm3'
  maybe chmod 0755 'init.d/grub-common'
@@ -2000,7 +2000,6 @@ maybe chmod 0755 'init.d/uuidd'
  maybe chmod 0755 'init.d/virtlogd'
  maybe chmod 0755 'init.d/winbind'
  maybe chmod 0755 'init.d/x11-common'
-maybe chmod 0644 'init/anacron.conf'
  maybe chmod 0644 'init/lightdm.conf'
  maybe chmod 0644 'init/portmap-wait.conf'
  maybe chmod 0644 'init/rpcbind-boot.conf'
@@ -2250,6 +2249,7 @@ maybe chmod 0644 'logrotate.d/ppp'
  maybe chmod 0644 'logrotate.d/rsyslog'
  maybe chmod 0644 'logrotate.d/samba'
  maybe chmod 0644 'logrotate.d/speech-dispatcher'
+maybe chmod 0644 'logrotate.d/ubuntu-advantage-tools'
  maybe chmod 0644 'logrotate.d/ufw'
  maybe chmod 0644 'logrotate.d/ulogd2'
  maybe chmod 0644 'logrotate.d/winbind'
@@ -2403,13 +2403,14 @@ maybe chmod 0755 'network/if-up.d/avahi-daemon'
  maybe chmod 0755 'network/if-up.d/bind9'
  maybe chmod 0755 'network/if-up.d/chrony'
  maybe chmod 0755 'network/if-up.d/ethtool'
-maybe chmod 0755 'network/if-up.d/ntpdate'
  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 0644 'network/interfaces'
  maybe chmod 0755 'network/interfaces.d'
  maybe chmod 0755 'networkd-dispatcher'
+maybe chmod 0755 'networkd-dispatcher/carrier.d'
+maybe chmod 0755 'networkd-dispatcher/degraded.d'
  maybe chmod 0755 'networkd-dispatcher/dormant.d'
  maybe chmod 0755 'networkd-dispatcher/no-carrier.d'
  maybe chmod 0755 'networkd-dispatcher/off.d'
@@ -2533,6 +2534,7 @@ maybe chmod 0644 'postfix/smtp_auth'
  maybe chmod 0644 'postfix/smtp_auth.db'
  maybe chmod 0644 'postfix/virtual'
  maybe chmod 0644 'postfix/virtual.db'
+maybe chmod 0755 'powerline'
  maybe chgrp 'dip' 'ppp'
  maybe chmod 0755 'ppp'
  maybe chmod 0600 'ppp/chap-secrets'
@@ -2573,7 +2575,6 @@ maybe chown 'frank' 'profile.d/fbrehm.sh'
  maybe chgrp 'users' 'profile.d/fbrehm.sh'
  maybe chmod 0644 'profile.d/fbrehm.sh'
  maybe chmod 0644 'profile.d/flatpak.sh'
-maybe chmod 0644 'profile.d/input-method-config.sh'
  maybe chmod 0644 'profile.d/libvirt-uri.sh'
  maybe chmod 0644 'profile.d/vte-2.91.sh'
  maybe chmod 0644 'profile.d/xdg_dirs_desktop_session.sh'
@@ -2613,7 +2614,6 @@ maybe chmod 0755 'resolvconf'
  maybe chmod 0755 'resolvconf/update-libc.d'
  maybe chmod 0755 'resolvconf/update-libc.d/avahi-daemon'
  maybe chmod 0755 'resolvconf/update-libc.d/postfix'
-maybe chmod 0755 'rmt'
  maybe chmod 0644 'rpc'
  maybe chmod 0644 'rsyslog.conf'
  maybe chmod 0755 'rsyslog.d'
@@ -2806,17 +2806,25 @@ maybe chmod 0755 'smartmontools/run.d/10powersave-notify'
  maybe chmod 0755 'smartmontools/run.d/60smart-notifier'
  maybe chmod 0755 'smartmontools/smartd_warning.d'
  maybe chmod 0644 'smi.conf'
+maybe chmod 0755 'snmp'
  maybe chmod 0755 'snmp-mibs-downloader'
+maybe chmod 0644 'snmp-mibs-downloader/cisco.conf'
+maybe chmod 0644 'snmp-mibs-downloader/ciscolist'
  maybe chmod 0644 'snmp-mibs-downloader/iana.conf'
  maybe chmod 0644 'snmp-mibs-downloader/ianalist'
  maybe chmod 0644 'snmp-mibs-downloader/ianarfc.conf'
  maybe chmod 0644 'snmp-mibs-downloader/ianarfclist'
+maybe chmod 0644 'snmp-mibs-downloader/junos.conf'
+maybe chmod 0644 'snmp-mibs-downloader/junoslist'
  maybe chmod 0644 'snmp-mibs-downloader/rfc.conf'
  maybe chmod 0644 'snmp-mibs-downloader/rfclist'
  maybe chmod 0644 'snmp-mibs-downloader/rfcmibs.diff'
+maybe chmod 0644 'snmp-mibs-downloader/screenos.conf'
+maybe chmod 0644 'snmp-mibs-downloader/screenoslist'
  maybe chmod 0644 'snmp-mibs-downloader/simplelist'
  maybe chmod 0644 'snmp-mibs-downloader/simpleweb.conf'
  maybe chmod 0644 'snmp-mibs-downloader/snmp-mibs-downloader.conf'
+maybe chmod 0644 'snmp/snmp.conf'
  maybe chmod 0755 'sound'
  maybe chmod 0755 'sound/events'
  maybe chmod 0644 'sound/events/gnome-2.soundlist'
@@ -2826,18 +2834,22 @@ maybe chmod 0755 'speech-dispatcher'
  maybe chmod 0755 'speech-dispatcher/clients'
  maybe chmod 0644 'speech-dispatcher/clients/emacs.conf'
  maybe chmod 0755 'speech-dispatcher/modules'
+maybe chmod 0644 'speech-dispatcher/modules/baratinoo.conf'
  maybe chmod 0644 'speech-dispatcher/modules/cicero.conf'
  maybe chmod 0644 'speech-dispatcher/modules/dtk-generic.conf'
  maybe chmod 0644 'speech-dispatcher/modules/epos-generic.conf'
  maybe chmod 0644 'speech-dispatcher/modules/espeak-generic.conf'
  maybe chmod 0644 'speech-dispatcher/modules/espeak-mbrola-generic.conf'
+maybe chmod 0644 'speech-dispatcher/modules/espeak-ng-mbrola-generic.conf'
  maybe chmod 0644 'speech-dispatcher/modules/espeak-ng.conf'
  maybe chmod 0644 'speech-dispatcher/modules/espeak.conf'
  maybe chmod 0644 'speech-dispatcher/modules/festival.conf'
  maybe chmod 0644 'speech-dispatcher/modules/flite.conf'
  maybe chmod 0644 'speech-dispatcher/modules/ibmtts.conf'
  maybe chmod 0644 'speech-dispatcher/modules/ivona.conf'
+maybe chmod 0644 'speech-dispatcher/modules/kali.conf'
  maybe chmod 0644 'speech-dispatcher/modules/llia_phon-generic.conf'
+maybe chmod 0644 'speech-dispatcher/modules/mary-generic.conf'
  maybe chmod 0644 'speech-dispatcher/modules/pico-generic.conf'
  maybe chmod 0644 'speech-dispatcher/modules/swift-generic.conf'
  maybe chmod 0644 'speech-dispatcher/speechd.conf'
@@ -2921,6 +2933,8 @@ maybe chmod 0755 'systemd/system/graphical.target.wants'
  maybe chmod 0644 'systemd/system/hddtemp.service'
  maybe chmod 0644 'systemd/system/local.service'
  maybe chmod 0755 'systemd/system/multi-user.target.wants'
+maybe chmod 0755 'systemd/system/netfilter-persistent.service.d'
+maybe chmod 0644 'systemd/system/netfilter-persistent.service.d/iptables.conf'
  maybe chmod 0755 'systemd/system/network-online.target.wants'
  maybe chmod 0755 'systemd/system/oem-config.service.wants'
  maybe chmod 0755 'systemd/system/paths.target.wants'
@@ -2942,6 +2956,7 @@ maybe chmod 0755 'systemd/system/zfs.target.wants'
  maybe chmod 0644 'systemd/timesyncd.conf'
  maybe chmod 0755 'systemd/user'
  maybe chmod 0644 'systemd/user.conf'
+maybe chmod 0755 'systemd/user/default.target.wants'
  maybe chmod 0755 'terminfo'
  maybe chmod 0644 'terminfo/README'
  maybe chmod 0755 'thermald'
@@ -2957,6 +2972,8 @@ maybe chmod 0755 'timeshift/restore-hooks.d/50_linuxmint'
  maybe chmod 0644 'timezone'
  maybe chmod 0755 'tmpfiles.d'
  maybe chmod 0644 'tmpfiles.d/screen-cleanup.conf'
+maybe chmod 0755 'ubuntu-advantage'
+maybe chmod 0644 'ubuntu-advantage/uaclient.conf'
  maybe chmod 0644 'ucf.conf'
  maybe chmod 0755 'udev'
  maybe chmod 0755 'udev/hwdb.d'
@@ -2991,8 +3008,6 @@ 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/80-esm'
-maybe chmod 0755 'update-motd.d/80-livepatch'
  maybe chmod 0755 'update-motd.d/90-updates-available'
  maybe chmod 0755 'update-motd.d/91-release-upgrade'
  maybe chmod 0755 'update-motd.d/95-hwe-eol'
@@ -3026,6 +3041,7 @@ maybe chmod 0755 'wpa_supplicant'
  maybe chmod 0755 'wpa_supplicant/action_wpa.sh'
  maybe chmod 0755 'wpa_supplicant/functions.sh'
  maybe chmod 0755 'wpa_supplicant/ifupdown.sh'
+maybe chmod 0644 'xattr.conf'
  maybe chmod 0755 'xdg'
  maybe chmod 0644 'xdg/Trolltech.conf'
  maybe chmod 0644 'xdg/accept-languages.codes'
@@ -3035,18 +3051,20 @@ maybe chmod 0644 'xdg/autostart/at-spi-dbus-bus.desktop'
  maybe chmod 0644 'xdg/autostart/blueberry-obex-agent.desktop'
  maybe chmod 0644 'xdg/autostart/blueberry-tray.desktop'
  maybe chmod 0644 'xdg/autostart/caribou-autostart.desktop'
+maybe chmod 0644 'xdg/autostart/geoclue-demo-agent.desktop'
  maybe chmod 0644 'xdg/autostart/gnome-keyring-pkcs11.desktop'
  maybe chmod 0644 'xdg/autostart/gnome-keyring-secrets.desktop'
  maybe chmod 0644 'xdg/autostart/gnome-keyring-ssh.desktop'
  maybe chmod 0644 'xdg/autostart/gnome-software-service.desktop'
  maybe chmod 0644 'xdg/autostart/gsettings-data-convert.desktop'
  maybe chmod 0644 'xdg/autostart/hplip-systray.desktop'
+maybe chmod 0644 'xdg/autostart/im-launch.desktop'
  maybe chmod 0644 'xdg/autostart/indicator-application.desktop'
  maybe chmod 0644 'xdg/autostart/indicator-messages.desktop'
  maybe chmod 0644 'xdg/autostart/mate-power-manager.desktop'
  maybe chmod 0644 'xdg/autostart/mate-screensaver.desktop'
  maybe chmod 0644 'xdg/autostart/mate-settings-daemon.desktop'
-maybe chmod 0644 'xdg/autostart/mate-volume-control-applet.desktop'
+maybe chmod 0644 'xdg/autostart/mate-volume-control-status-icon.desktop'
  maybe chmod 0644 'xdg/autostart/mint-ctrl-alt-backspace.desktop'
  maybe chmod 0644 'xdg/autostart/mintinstall-update-flatpak.desktop'
  maybe chmod 0644 'xdg/autostart/mintreport.desktop'
@@ -3084,6 +3102,7 @@ maybe chmod 0644 'xdg/autostart/smart-notifier.desktop'
  maybe chmod 0644 'xdg/autostart/snap-userd-autostart.desktop'
  maybe chmod 0644 'xdg/autostart/tracker-store.desktop'
  maybe chmod 0644 'xdg/autostart/user-dirs-update-gtk.desktop'
+maybe chmod 0644 'xdg/autostart/xapp-sn-watcher.desktop'
  maybe chmod 0644 'xdg/autostart/xdg-user-dirs.desktop'
  maybe chmod 0755 'xdg/colors'
  maybe chmod 0644 'xdg/colors/40.colors'
diff --git a/ImageMagick-6/coder.xml b/ImageMagick-6/coder.xml

index 5c62cb46459843d5c22493a1063de4db6c435f69..4d2394febf2977b0606a302354c9a135cc534245 100644 (file)
--- a/ImageMagick-6/coder.xml
+++ b/ImageMagick-6/coder.xml
@@ -1,9 +1,10 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE codermap [
-<!ELEMENT codermap (coder)*>
-<!ELEMENT coder (#PCDATA)>
-<!ATTLIST coder magick CDATA #REQUIRED>
-<!ATTLIST coder name CDATA #REQUIRED>
+<!ELEMENT codermap (coder)+>
+  <!ATTLIST codermap xmlns CDATA #FIXED ''>
+  <!ELEMENT coder EMPTY>
+  <!ATTLIST coder xmlns CDATA #FIXED '' magick NMTOKEN #REQUIRED
+    name NMTOKEN #REQUIRED>
  ]>
  <!--
    Associate an image format with the specified coder module.
diff --git a/ImageMagick-6/delegates.xml b/ImageMagick-6/delegates.xml

index b2a98699ccf98a9a0d0c33121086b2415da0aa4b..ea0efd850c1f2a9f2e9b41dc09ddba89b1c36154 100644 (file)
--- a/ImageMagick-6/delegates.xml
+++ b/ImageMagick-6/delegates.xml
@@ -1,13 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE delegatemap [
-<!ELEMENT delegatemap (delegate)+>
-<!ELEMENT delegate (#PCDATA)>
-<!ATTLIST delegate decode CDATA #IMPLIED>
-<!ATTLIST delegate encode CDATA #IMPLIED>
-<!ATTLIST delegate mode CDATA #IMPLIED>
-<!ATTLIST delegate spawn CDATA #IMPLIED>
-<!ATTLIST delegate stealth CDATA #IMPLIED>
-<!ATTLIST delegate thread-support CDATA #IMPLIED>
-<!ATTLIST delegate command CDATA #REQUIRED>
+  <!ELEMENT delegatemap (delegate)+>
+  <!ATTLIST delegatemap xmlns CDATA #FIXED ''>
+  <!ELEMENT delegate EMPTY>
+  <!ATTLIST delegate xmlns CDATA #FIXED '' command CDATA #REQUIRED
+    decode NMTOKEN #IMPLIED encode NMTOKEN #IMPLIED mode NMTOKEN #IMPLIED
+    spawn NMTOKEN #IMPLIED stealth NMTOKEN #IMPLIED>
  ]>
  <!--
    Delegate command file.
@@ -61,15 +59,15 @@
  -->
  <delegatemap>
    <delegate decode="bpg" command="&quot;bpgdec&quot; -b 16 -o &quot;%o.png&quot; &quot;%i&quot;; /bin/mv &quot;%o.png&quot; &quot;%o&quot;"/>
-  <delegate decode="png" encode="bpg" command="&quot;bpgenc&quot; -b 12 -sstdout=%%stderr &quot;%Q&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
+  <delegate decode="png" encode="bpg" command="&quot;bpgenc&quot; -b 12 -q &quot;%~&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
    <delegate decode="blender" command="&quot;blender&quot; -b &quot;%i&quot; -F PNG -o &quot;%o&quot;&quot;\n&quot;convert&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
-  <delegate decode="browse" stealth="True" spawn="True" command="&quot;xdg-open&quot; http://www.imagemagick.org/; /bin/rm &quot;%i&quot;"/>
+  <delegate decode="browse" stealth="True" spawn="True" command="&quot;xdg-open&quot; https://imagemagick.org/; /bin/rm &quot;%i&quot;"/>
    <delegate decode="cdr" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; /bin/mv &quot;%o.svg&quot; &quot;%o&quot;"/>
    <delegate decode="cgm" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; /bin/mv &quot;%o.svg&quot; &quot;%o&quot;"/>
    <delegate decode="https" command="&quot;curl&quot; -s -k -L -o &quot;%o&quot; &quot;https:%M&quot;"/>
-  <delegate decode="dng:decode" command="&quot;ufraw-batch&quot; --silent --create-id=also --out-type=png --out-depth=16 &quot;--output=%u.png&quot; &quot;%i&quot;"/>
    <delegate decode="doc" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
    <delegate decode="docx" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="dng:decode" command="&quot;ufraw-batch&quot; --silent --create-id=also --out-type=png --out-depth=16 &quot;--output=%u.png&quot; &quot;%i&quot;"/>
    <delegate decode="dot" command='&quot;dot&quot; -Tsvg &quot;%i&quot; -o &quot;%o&quot;' />
    <delegate decode="dvi" command="&quot;dvips&quot; -sstdout=%%stderr -o &quot;%o&quot; &quot;%i&quot;"/>
    <delegate decode="dxf" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; /bin/mv &quot;%o.svg&quot; &quot;%o&quot;"/>
@@ -83,7 +81,7 @@
    <delegate decode="html" command="&quot;html2ps&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
    <delegate decode="ilbm" command="&quot;ilbmtoppm&quot; &quot;%i&quot; &gt; &quot;%o&quot;"/>
    <delegate decode="jpg" encode="lep" mode="encode" command="&quot;lepton&quot; &quot;%i&quot; &quot;%o&quot;"/>
-  <delegate decode="jxr" command="/bin/mv &quot;%i&quot; &quot;%i.jxr&quot;; &quot;JxrDecApp&quot; -i &quot;%i.jxr&quot; -o &quot;%o.bmp&quot; -c 0; /bin/mv &quot;%i.jxr&quot; &quot;%i&quot;; /bin/mv &quot;%o.bmp&quot; &quot;%o&quot;"/>
+  <delegate decode="jxr" command="/bin/mv &quot;%i&quot; &quot;%i.jxr&quot;; &quot;JxrDecApp&quot; -i &quot;%i.jxr&quot; -o &quot;%o.pnm&quot;; /bin/mv &quot;%i.jxr&quot; &quot;%i&quot;; /bin/mv &quot;%o.pnm&quot; &quot;%o&quot;"/>
    <delegate decode="lep" mode="decode" command="&quot;lepton&quot; &quot;%i&quot; &quot;%o&quot;"/>
    <delegate decode="miff" encode="show" spawn="True" command="&quot;display&quot; -immutable -delay 0 -title &quot;%M&quot; &quot;%i&quot;"/>
    <delegate decode="miff" encode="win" stealth="True" spawn="True" command="&quot;display&quot; -immutable -delay 0 -title &quot;%M&quot; &quot;%i&quot;"/>
@@ -92,7 +90,7 @@
    <delegate decode="pcl:cmyk" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pamcmyk32&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
    <delegate decode="pcl:color" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
    <delegate decode="pcl:mono" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pbmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
-  <delegate decode="pdf" encode="eps" mode="bi" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=eps2write&quot; -sPDFPassword=&quot;%a&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
+  <delegate decode="pdf" encode="eps" mode="bi" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 -sPDFPassword=&quot;%a&quot; &quot;-sDEVICE=eps2write&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
    <delegate decode="pdf" encode="ps" mode="bi" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ps2write&quot; -sPDFPassword=&quot;%a&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
    <delegate decode="png" encode="webp" command="&quot;cwebp&quot; -quiet %Q &quot;%i&quot; -o &quot;%o&quot;"/>
    <delegate decode="pnm" encode="ilbm" mode="encode" command="&quot;ppmtoilbm&quot; -24if &quot;%i&quot; &gt; &quot;%o&quot;"/>
@@ -100,6 +98,7 @@
    <delegate decode="bmp" encode="wdp" command="/bin/mv &quot;%i&quot; &quot;%i.bmp&quot;; &quot;JxrEncApp&quot; -i &quot;%i.bmp&quot; -o &quot;%o.jxr&quot;; /bin/mv &quot;%i.bmp&quot; &quot;%i&quot;; /bin/mv &quot;%o.jxr&quot; &quot;%o&quot;"/>
    <delegate decode="ppt" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
    <delegate decode="pptx" command="&quot;soffice&quot; --convert-to pdf -outdir `dirname &quot;%i&quot;` &quot;%i&quot; 2&gt; &quot;%u&quot;; /bin/mv &quot;%i.pdf&quot; &quot;%o&quot;"/>
+  <delegate decode="ps" encode="prt" command='&quot;lpr&quot; &quot;%i&quot;'/>
    <delegate decode="ps:alpha" stealth="True" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pngalpha&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
    <delegate decode="ps:cmyk" stealth="True" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pamcmyk32&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
    <delegate decode="ps:color" stealth="True" command="&quot;gs&quot; -sstdout=%%stderr -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pnmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;-f%s&quot; &quot;-f%s&quot;"/>
diff --git a/ImageMagick-6/log.xml b/ImageMagick-6/log.xml

index cdacdab8436d6c2f87d96839ee56641b1e8e06e9..8a290992a4a1ad8604d29eeb1716ff0591bf9e9a 100644 (file)
--- a/ImageMagick-6/log.xml
+++ b/ImageMagick-6/log.xml
@@ -10,6 +10,45 @@
  <!ATTLIST log format CDATA #IMPLIED>
  ]>
  <!--
+  Configure ImageMagick logger.
+
+  Choose from one or more these events separated by a comma:
+    all
+    accelerate
+    annotate
+    blob
+    cache
+    coder
+    command
+    configure
+    deprecate
+    draw
+    exception
+    locale
+    module
+    none
+    pixel
+    policy
+    resource
+    trace
+    transform
+    user
+    wand
+    x11
+
+  Choose one output handler:
+    console
+    debug
+    event
+    file
+    none
+    stderr
+    stdout
+
+  When output is to a file, specify the filename.  Embed %g in the filename to
+  support log generations.  Generations is the number of log files to retain.
+  Limit is the number of logging events before generating a new log generation.
+
    The format of the log is defined by embedding special format characters:
  
      %c   client
@@ -29,6 +68,7 @@
      %%   percent sign
      \n   newline
      \r   carriage return
+    xml
  -->
  <logmap>
    <log events="None"/>
diff --git a/ImageMagick-6/mime.xml b/ImageMagick-6/mime.xml

index c1b61f47deb690c0ea27003693c4a28f16543daa..9530fc8d06ea46ac19f13a13a9ceb3c48cb6c7f2 100644 (file)
--- a/ImageMagick-6/mime.xml
+++ b/ImageMagick-6/mime.xml
@@ -13,6 +13,9 @@
    <!ATTLIST mime mask CDATA #IMPLIED>
    <!ATTLIST mime priority CDATA #IMPLIED>
  ]>
+<!--
+  Configure ImageMagick mime types.
+-->
  <mimemap>
    <mime type="application/andrew-inset" acronym="ATK" description="Andrew Toolkit" priority="100" pattern="*.ez" />
    <mime type="application/illustrator" description="Adobe Illustrator document" priority="100" pattern="*.ai" />
diff --git a/ImageMagick-6/policy.xml b/ImageMagick-6/policy.xml

index c42e6fdc78595c041986b4bd04afcb5f21ae53e8..82a3d0b60df644fff9f5a3d213d6c1da7982d87a 100644 (file)
--- a/ImageMagick-6/policy.xml
+++ b/ImageMagick-6/policy.xml
@@ -1,19 +1,18 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE policymap [
-<!ELEMENT policymap (policy)+>
-<!ELEMENT policy (#PCDATA)>
-<!ATTLIST policy domain (delegate|coder|filter|path|resource) #IMPLIED>
-<!ATTLIST policy name CDATA #IMPLIED>
-<!ATTLIST policy rights CDATA #IMPLIED>
-<!ATTLIST policy pattern CDATA #IMPLIED>
-<!ATTLIST policy value CDATA #IMPLIED>
+  <!ELEMENT policymap (policy)+>
+  <!ATTLIST policymap xmlns CDATA #FIXED ''>
+  <!ELEMENT policy EMPTY>
+  <!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+    name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+    stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
  ]>
  <!--
    Configure ImageMagick policies.
  
    Domains include system, delegate, coder, filter, path, or resource.
  
-  Rights include none, read, write, and execute.  Use | to combine them,
+  Rights include none, read, write, execute and all.  Use | to combine them,
    for example: "read | write" to permit read from, or write to, a path.
  
    Use a glob expression as a pattern.
@@ -26,40 +25,58 @@
  
      <policy domain="coder" rights="none" pattern="HTTP" />
  
-  Lets prevent users from executing any image filters:
-
-    <policy domain="filter" rights="none" pattern="*" />
-
    The /repository file system is restricted to read only.  We use a glob
    expression to match all paths that start with /repository:
-  
+
      <policy domain="path" rights="read" pattern="/repository/*" />
  
-  Let's prevent possible exploits by removing the right to use indirect reads.
+  Lets prevent users from executing any image filters:
  
-    <policy domain="path" rights="none" pattern="@*" />
+    <policy domain="filter" rights="none" pattern="*" />
  
    Any large image is cached to disk rather than memory:
  
-    <policy domain="resource" name="area" value="1GB"/>
+    <policy domain="resource" name="area" value="1GP"/>
  
-  Define arguments for the memory, map, area, width, height, and disk resources
+  Define arguments for the memory, map, area, width, height and disk resources
    with SI prefixes (.e.g 100MB).  In addition, resource policies are maximums
    for each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB
    exceeds policy maximum so memory limit is 1GB).
+
+  Rules are processed in order.  Here we want to restrict ImageMagick to only
+  read or write a small subset of proven web-safe image types:
+
+    <policy domain="delegate" rights="none" pattern="*" />
+    <policy domain="filter" rights="none" pattern="*" />
+    <policy domain="coder" rights="none" pattern="*" />
+    <policy domain="coder" rights="read|write" pattern="{GIF,JPEG,PNG,WEBP}" />
  -->
  <policymap>
+  <!-- <policy domain="system" name="shred" value="2"/> -->
+  <!-- <policy domain="system" name="precision" value="6"/> -->
+  <!-- <policy domain="system" name="memory-map" value="anonymous"/> -->
+  <!-- <policy domain="system" name="max-memory-request" value="256MiB"/> -->
    <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
    <policy domain="resource" name="memory" value="256MiB"/>
    <policy domain="resource" name="map" value="512MiB"/>
    <policy domain="resource" name="width" value="16KP"/>
    <policy domain="resource" name="height" value="16KP"/>
+  <!-- <policy domain="resource" name="list-length" value="128"/> -->
    <policy domain="resource" name="area" value="128MB"/>
    <policy domain="resource" name="disk" value="1GiB"/>
    <!-- <policy domain="resource" name="file" value="768"/> -->
    <!-- <policy domain="resource" name="thread" value="4"/> -->
    <!-- <policy domain="resource" name="throttle" value="0"/> -->
    <!-- <policy domain="resource" name="time" value="3600"/> -->
+  <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
+  <!-- <policy domain="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
+  <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
+  <!-- <policy domain="path" rights="none" pattern="@*" /> -->
+  <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
+  <!-- <policy domain="cache" name="synchronize" value="True"/> -->
+  <!-- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -->
+  <!-- <policy domain="system" name="pixel-cache-memory" value="anonymous"/> -->
+  <!-- <policy domain="system" name="shred" value="2"/> -->
    <!-- <policy domain="system" name="precision" value="6"/> -->
    <!-- not needed due to the need to use explicitly by mvg: -->
    <!-- <policy domain="delegate" rights="none" pattern="MVG" /> -->
@@ -69,7 +86,6 @@
    <policy domain="delegate" rights="none" pattern="HTTP" />
    <!-- in order to avoid to get image with password text -->
    <policy domain="path" rights="none" pattern="@*"/>
-  <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/>
    <!-- disable ghostscript format types -->
    <policy domain="coder" rights="none" pattern="PS" />
    <policy domain="coder" rights="none" pattern="PS2" />
diff --git a/ImageMagick-6/quantization-table.xml b/ImageMagick-6/quantization-table.xml

index a05552bb75e83f1c5f2caef14baea65a173ec822..fb718749a257de22cfc80decbe5ce10e8de239f1 100644 (file)
--- a/ImageMagick-6/quantization-table.xml
+++ b/ImageMagick-6/quantization-table.xml
@@ -1,13 +1,18 @@
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <!DOCTYPE quantization-tables [
-<!ELEMENT quantization-tables (table)+>
-<!ELEMENT table (description , levels)>
-<!ELEMENT description (CDATA)>
-<!ELEMENT levels (CDATA)>
-<!ATTLIST table slot ID #REQUIRED>
-<!ATTLIST levels width CDATA #REQUIRED>
-<!ATTLIST levels height CDATA #REQUIRED>
-<!ATTLIST levels divisor CDATA #REQUIRED>
+  <!ELEMENT quantization-tables (table)>
+  <!ATTLIST quantization-tables xmlns CDATA #FIXED "">
+  <!ELEMENT table (description , levels)>
+  <!ATTLIST table xmlns CDATA #FIXED "">
+  <!ATTLIST table alias NMTOKEN #REQUIRED>
+  <!ATTLIST table slot CDATA #REQUIRED>
+  <!ELEMENT description (#PCDATA)>
+  <!ATTLIST description xmlns CDATA #FIXED "">
+  <!ELEMENT levels (#PCDATA)>
+  <!ATTLIST levels xmlns CDATA #FIXED "">
+  <!ATTLIST levels divisor CDATA #REQUIRED>
+  <!ATTLIST levels height CDATA #REQUIRED>
+  <!ATTLIST levels width CDATA #REQUIRED>
  ]>
  <!--
    JPEG quantization table created by Dr. Nicolas Robidoux, Senior Research
@@ -47,16 +52,17 @@
        85,  75,  135, 156, 189, 238, 311, 418
      </levels>
    </table>
-<!--
-  If you want to use a different quantization table for Chroma (say), just add 
+  <!--
+    If you want to use a different quantization table for Chroma, for example,
+    just add:
  
-  <table slot="1" alias="chroma">
-    <description>Chroma Quantization Table</description>
-    INSERT 64 POSITIVE INTEGERS HERE, COMMA-SEPARATED
-    </levels>
-  </table>
+    <table slot="1" alias="chroma">
+      <description>Chroma Quantization Table</description>
+      INSERT 64 POSITIVE INTEGERS HERE, COMMA-SEPARATED
+      </levels>
+    </table>
  
-  here (but outside of these comments).
--->
+    here (but outside of these comments).
+  -->
  </quantization-tables>
  
diff --git a/ImageMagick-6/thresholds.xml b/ImageMagick-6/thresholds.xml

index 2ca2daba2d408b46be45d829507aebb59ce99540..02b96a85af5238aa86c023ad1821d435b29917e1 100644 (file)
--- a/ImageMagick-6/thresholds.xml
+++ b/ImageMagick-6/thresholds.xml
@@ -1,13 +1,15 @@
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <!DOCTYPE thresholds [
-<!ELEMENT thresholds (threshold)+>
-<!ELEMENT threshold (description , levels)>
-<!ELEMENT description (CDATA)>
-<!ELEMENT levels (CDATA)>
-<!ATTLIST threshold map ID #REQUIRED>
-<!ATTLIST levels width CDATA #REQUIRED>
-<!ATTLIST levels height CDATA #REQUIRED>
-<!ATTLIST levels divisor CDATA #REQUIRED>
+  <!ELEMENT thresholds (threshold)+>
+  <!ATTLIST thresholds xmlns CDATA #FIXED ''>
+  <!ELEMENT threshold (description,levels)>
+  <!ATTLIST threshold xmlns CDATA #FIXED '' alias NMTOKEN #IMPLIED
+    map NMTOKEN #REQUIRED>
+  <!ELEMENT description (#PCDATA)>
+  <!ATTLIST description xmlns CDATA #FIXED ''>
+  <!ELEMENT levels (#PCDATA)>
+  <!ATTLIST levels xmlns CDATA #FIXED '' divisor CDATA #REQUIRED
+    height CDATA #REQUIRED width CDATA #REQUIRED>
  ]>
  <!--
    Threshold Maps for Ordered Posterized Dither
diff --git a/ImageMagick-6/type-apple.xml b/ImageMagick-6/type-apple.xml

index 08fc0c499baef6a526707dd679bb518ce7fc6971..57fe9d142eddce0636995e6be2b9a5c1af4c9907 100644 (file)
--- a/ImageMagick-6/type-apple.xml
+++ b/ImageMagick-6/type-apple.xml
@@ -1,1371 +1,1367 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE typemap [
-<!ELEMENT typemap (type)+>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST type name CDATA #REQUIRED>
-<!ATTLIST type fullname CDATA #IMPLIED>
-<!ATTLIST type family CDATA #IMPLIED>
-<!ATTLIST type foundry CDATA #IMPLIED>
-<!ATTLIST type weight CDATA #IMPLIED>
-<!ATTLIST type style CDATA #IMPLIED>
-<!ATTLIST type stretch CDATA #IMPLIED>
-<!ATTLIST type format CDATA #IMPLIED>
-<!ATTLIST type metrics CDATA #IMPLIED>
-<!ATTLIST type glyphs CDATA #REQUIRED>
-<!ATTLIST type version CDATA #IMPLIED>
-<!ATTLIST include file CDATA #REQUIRED>
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
  ]>
+<!--
+  ImageMagick Apple font configuration.
+-->
  <typemap>
    <type
       format="ttf"
       name="AlBayan"
       fullname="Al Bayan Plain"
       family="Al Bayan"
-     glyphs="AlBayan.ttf"
+     glyphs="/AlBayan.ttf"
       />
    <type
       format="ttf"
       name="AlBayanB"
       fullname="Al Bayan Bold"
       family="Al Bayan"
-     glyphs="AlBayanBold.ttf"
+     glyphs="/AlBayanBold.ttf"
       />
    <type
       format="ttf"
       name="AndaleMono"
       fullname="Andale Mono"
       family="Andale Mono"
-     glyphs="Andale Mono.ttf"
+     glyphs="/Andale Mono.ttf"
       />
    <type
       format="ttf"
       name="AppleChancery"
       fullname="Apple Chancery"
       family="Apple Chancery"
-     glyphs="Apple Chancery.ttf"
+     glyphs="/Apple Chancery.ttf"
       />
    <type
       format="ttf"
       name="AppleLiGothicM"
       fullname="Apple LiGothic Medium"
       family="Apple LiGothic"
-     glyphs="Apple LiGothic Medium.ttf"
+     glyphs="/Apple LiGothic Medium.ttf"
       />
    <type
       format="ttf"
       name="AppleLiSungL"
       fullname="Apple LiSung Light"
       family="Apple LiSung"
-     glyphs="Apple LiSung Light.ttf"
+     glyphs="/Apple LiSung Light.ttf"
       />
    <type
       format="ttf"
       name="AppleMyungjo"
       fullname="AppleMyungjo Regular"
       family="AppleMyungjo"
-     glyphs="AppleMyungjo.ttf"
+     glyphs="/AppleMyungjo.ttf"
       />
    <type
       format="ttf"
       name="ArialBk"
       fullname="Arial Black"
       family="Arial Black"
-     glyphs="Arial Black.ttf"
+     glyphs="/Arial Black.ttf"
       />
    <type
       format="ttf"
       name="ArialBI"
       fullname="Arial Bold Italic"
       family="Arial"
-     glyphs="Arial Bold Italic.ttf"
+     glyphs="/Arial Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="ArialB"
       fullname="Arial Bold"
       family="Arial"
-     glyphs="Arial Bold.ttf"
+     glyphs="/Arial Bold.ttf"
       />
    <type
       format="ttf"
       name="ArialI"
       fullname="Arial Italic"
       family="Arial"
-     glyphs="Arial Italic.ttf"
+     glyphs="/Arial Italic.ttf"
       />
    <type
       format="ttf"
       name="ArialNarrowBI"
       fullname="Arial Narrow Bold Italic"
       family="Arial Narrow"
-     glyphs="Arial Narrow Bold Italic.ttf"
+     glyphs="/Arial Narrow Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="ArialNarrowB"
       fullname="Arial Narrow Bold"
       family="Arial Narrow"
-     glyphs="Arial Narrow Bold.ttf"
+     glyphs="/Arial Narrow Bold.ttf"
       />
    <type
       format="ttf"
       name="ArialNarrowI"
       fullname="Arial Narrow Italic"
       family="Arial Narrow"
-     glyphs="Arial Narrow Italic.ttf"
+     glyphs="/Arial Narrow Italic.ttf"
       />
    <type
       format="ttf"
       name="ArialNarrow"
       fullname="Arial Narrow"
       family="Arial Narrow"
-     glyphs="Arial Narrow.ttf"
+     glyphs="/Arial Narrow.ttf"
       />
    <type
       format="ttf"
       name="ArialRoundedB"
       fullname="Arial Rounded MT Bold"
       family="Arial Rounded Bold"
-     glyphs="Arial Rounded Bold.ttf"
+     glyphs="/Arial Rounded Bold.ttf"
       />
    <type
       format="ttf"
       name="ArialUnicode"
       fullname="Arial Unicode MS"
       family="Arial Unicode"
-     glyphs="Arial Unicode.ttf"
+     glyphs="/Arial Unicode.ttf"
       />
    <type
       format="ttf"
       name="Arial"
       fullname="Arial"
       family="Arial"
-     glyphs="Arial.ttf"
+     glyphs="/Arial.ttf"
       />
    <type
       format="ttf"
       name="ArialHebrew"
       fullname="Arial Hebrew"
       family="Arial Hebrew"
-     glyphs="ArialHB.ttf"
+     glyphs="/ArialHB.ttf"
       />
    <type
       format="ttf"
       name="ArialHebrewB"
       fullname="Arial Hebrew Bold"
       family="Arial Hebrew"
-     glyphs="ArialHBBold.ttf"
+     glyphs="/ArialHBBold.ttf"
       />
    <type
       format="ttf"
       name="AsapB"
       fullname="Asap Bold"
       family="Asap"
-     glyphs="Asap-Bold.ttf"
+     glyphs="/Asap-Bold.ttf"
       />
    <type
       format="ttf"
       name="AsapBI"
       fullname="Asap Bold Italic"
       family="Asap"
-     glyphs="Asap-BoldItalic.ttf"
+     glyphs="/Asap-BoldItalic.ttf"
       />
    <type
       format="ttf"
       name="AsapI"
       fullname="Asap Italic"
       family="Asap"
-     glyphs="Asap-Italic.ttf"
+     glyphs="/Asap-Italic.ttf"
       />
    <type
       format="ttf"
       name="Asap"
       fullname="Asap"
       family="Asap"
-     glyphs="Asap-Regular.ttf"
+     glyphs="/Asap-Regular.ttf"
       />
    <type
       format="ttf"
       name="AvantGardeDemi"
       fullname="Avant Garde Demi BT"
       family="AvantGarde Bk BT"
-     glyphs="Avant Garde Demi.ttf"
+     glyphs="/Avant Garde Demi.ttf"
       />
    <type
       format="ttf"
       name="Ayuthaya"
       fullname="Ayuthaya"
       family="Ayuthaya"
-     glyphs="Ayuthaya.ttf"
+     glyphs="/Ayuthaya.ttf"
       />
    <type
       format="ttf"
       name="Baghdad"
       fullname="Baghdad"
       family="Baghdad"
-     glyphs="Baghdad.ttf"
+     glyphs="/Baghdad.ttf"
       />
    <type
       format="ttf"
       name="BiauKai"
       fullname="BiauKai"
       family="BiauKai"
-     glyphs="BiauKai.ttf"
+     glyphs="/BiauKai.ttf"
       />
    <type
       format="ttf"
       name="BigCaslonM"
       fullname="Big Caslon Medium"
       family="Big Caslon"
-     glyphs="BigCaslon.ttf"
+     glyphs="/BigCaslon.ttf"
       />
    <type
       format="ttf"
       name="BrushScriptI"
       fullname="Brush Script MT Italic"
       family="Brush Script "
-     glyphs="Brush Script.ttf"
+     glyphs="/Brush Script.ttf"
       />
    <type
       format="ttf"
       name="Candice"
       fullname="Candice"
       family="Candice"
-     glyphs="Candice.ttf"
+     glyphs="/Candice.ttf"
       />
    <type
       format="ttf"
       name="Chalkduster"
       fullname="Chalkduster"
       family="Chalkduster"
-     glyphs="Chalkduster.ttf"
+     glyphs="/Chalkduster.ttf"
       />
    <type
       format="ttf"
       name="ComicSansMSB"
       fullname="Comic Sans MS Bold"
       family="Comic Sans"
-     glyphs="Comic Sans MS Bold.ttf"
+     glyphs="/Comic Sans MS Bold.ttf"
       />
    <type
       format="ttf"
       name="ComicSans"
       fullname="Comic Sans MS"
       family="Comic Sans"
-     glyphs="Comic Sans MS.ttf"
+     glyphs="/Comic Sans MS.ttf"
       />
    <type
       format="ttf"
       name="ComicSans"
       fullname="Comic Sans MS"
       family="Comic Sans"
-     glyphs="comic.ttf"
+     glyphs="/comic.ttf"
       />
    <type
       format="ttf"
       name="ComicSansMSB"
       fullname="Comic Sans MS Bold"
       family="Comic Sans"
-     glyphs="comicbd.ttf"
+     glyphs="/comicbd.ttf"
       />
    <type
       format="ttf"
       name="CorsivaHebrew"
       fullname="Corsiva Hebrew"
       family="Corsiva Hebrew"
-     glyphs="Corsiva.ttf"
+     glyphs="/Corsiva.ttf"
       />
    <type
       format="ttf"
       name="CorsivaHebrewB"
       fullname="Corsiva Hebrew Bold"
       family="Corsiva Hebrew"
-     glyphs="CorsivaBold.ttf"
+     glyphs="/CorsivaBold.ttf"
       />
    <type
       format="ttf"
       name="CourierNewBI"
       fullname="Courier New Bold Italic"
       family="Courier New"
-     glyphs="Courier New Bold Italic.ttf"
+     glyphs="/Courier New Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="CourierNewB"
       fullname="Courier New Bold"
       family="Courier New"
-     glyphs="Courier New Bold.ttf"
+     glyphs="/Courier New Bold.ttf"
       />
    <type
       format="ttf"
       name="CourierNewI"
       fullname="Courier New Italic"
       family="Courier New"
-     glyphs="Courier New Italic.ttf"
+     glyphs="/Courier New Italic.ttf"
       />
    <type
       format="ttf"
       name="CourierNew"
       fullname="Courier New"
       family="Courier New"
-     glyphs="Courier New.ttf"
+     glyphs="/Courier New.ttf"
       />
    <type
       format="ttf"
       name="DecoTypeNaskh"
       fullname="DecoType Naskh"
       family="DecoType Naskh"
-     glyphs="DecoTypeNaskh.ttf"
+     glyphs="/DecoTypeNaskh.ttf"
       />
    <type
       format="ttf"
       name="Devanagari"
       fullname="Devanagari MT"
       family="Devanagari "
-     glyphs="DevanagariMT.ttf"
+     glyphs="/DevanagariMT.ttf"
       />
    <type
       format="ttf"
       name="DevanagariB"
       fullname="Devanagari MT Bold"
       family="Devanagari "
-     glyphs="DevanagariMTBold.ttf"
+     glyphs="/DevanagariMTBold.ttf"
       />
    <type
       format="ttf"
       name="EuphemiaUCASB"
       fullname="Euphemia UCAS Bold"
       family="Euphemia UCAS"
-     glyphs="EuphemiaCASBold.ttf"
+     glyphs="/EuphemiaCASBold.ttf"
       />
    <type
       format="ttf"
       name="EuphemiaUCASI"
       fullname="Euphemia UCAS Italic"
       family="Euphemia UCAS"
-     glyphs="EuphemiaCASItalic.ttf"
+     glyphs="/EuphemiaCASItalic.ttf"
       />
    <type
       format="ttf"
       name="EuphemiaUCAS"
       fullname="Euphemia UCAS"
       family="Euphemia UCAS"
-     glyphs="EuphemiaCASRegular.ttf"
+     glyphs="/EuphemiaCASRegular.ttf"
       />
    <type
       format="ttf"
       name="GeorgiaBI"
       fullname="Georgia Bold Italic"
       family="Georgia"
-     glyphs="Georgia Bold Italic.ttf"
+     glyphs="/Georgia Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="GeorgiaB"
       fullname="Georgia Bold"
       family="Georgia"
-     glyphs="Georgia Bold.ttf"
+     glyphs="/Georgia Bold.ttf"
       />
    <type
       format="ttf"
       name="GeorgiaI"
       fullname="Georgia Italic"
       family="Georgia"
-     glyphs="Georgia Italic.ttf"
+     glyphs="/Georgia Italic.ttf"
       />
    <type
       format="ttf"
       name="Georgia"
       fullname="Georgia"
       family="Georgia"
-     glyphs="Georgia.ttf"
+     glyphs="/Georgia.ttf"
       />
    <type
       format="ttf"
       name="GreekMathSymbols"
       fullname="GreekMathSymbols Normal"
       family="GreekMathSymbols"
-     glyphs="GreekMathSymbols Normal.ttf"
+     glyphs="/GreekMathSymbols Normal.ttf"
       />
    <type
       format="ttf"
       name="Gujarati"
       fullname="Gujarati MT"
       family="Gujarati "
-     glyphs="GujaratiMT.ttf"
+     glyphs="/GujaratiMT.ttf"
       />
    <type
       format="ttf"
       name="GujaratiB"
       fullname="Gujarati MT Bold"
       family="Gujarati "
-     glyphs="GujaratiMTBold.ttf"
+     glyphs="/GujaratiMTBold.ttf"
       />
    <type
       format="ttf"
       name="Gulim"
       fullname="Gulim"
       family="Gulim"
-     glyphs="Gulim.ttf"
+     glyphs="/Gulim.ttf"
       />
    <type
       format="ttf"
       name="GungSeo"
       fullname="GungSeo Regular"
       family="GungSeo"
-     glyphs="Gungseouche.ttf"
+     glyphs="/Gungseouche.ttf"
       />
    <type
       format="ttf"
       name="Gurmukhi"
       fullname="Gurmukhi MT"
       family="Gurmukhi "
-     glyphs="Gurmukhi.ttf"
+     glyphs="/Gurmukhi.ttf"
       />
    <type
       format="ttf"
       name="HeadLineA"
       fullname="HeadLineA Regular"
       family="HeadLineA"
-     glyphs="HeadlineA.ttf"
+     glyphs="/HeadlineA.ttf"
       />
    <type
       format="ttf"
       name="Hei"
       fullname="Hei Regular"
       family="Hei"
-     glyphs="Hei.ttf"
+     glyphs="/Hei.ttf"
       />
    <type
       format="ttf"
       name="Herculanum"
       fullname="Herculanum"
       family="Herculanum"
-     glyphs="Herculanum.ttf"
+     glyphs="/Herculanum.ttf"
       />
    <type
       format="ttf"
       name="HoeflerTextOrnaments"
       fullname="Hoefler Text Ornaments"
       family="Hoefler Text"
-     glyphs="Hoefler Text Ornaments.ttf"
+     glyphs="/Hoefler Text Ornaments.ttf"
       />
    <type
       format="ttf"
       name="Impact"
       fullname="Impact"
       family="Impact"
-     glyphs="Impact.ttf"
+     glyphs="/Impact.ttf"
       />
    <type
       format="ttf"
       name="InaiMathi"
       fullname="InaiMathi"
       family="InaiMathi"
-     glyphs="InaiMathi.ttf"
+     glyphs="/InaiMathi.ttf"
       />
    <type
       format="ttf"
       name="Kai"
       fullname="Kai Regular"
       family="Kai"
-     glyphs="Kai.ttf"
+     glyphs="/Kai.ttf"
       />
    <type
       format="ttf"
       name="Kailasa"
       fullname="Kailasa Regular"
       family="Kailasa"
-     glyphs="Kailasa.ttf"
+     glyphs="/Kailasa.ttf"
       />
    <type
       format="ttf"
       name="Kokonor"
       fullname="Kokonor Regular"
       family="Kokonor"
-     glyphs="Kokonor.ttf"
+     glyphs="/Kokonor.ttf"
       />
    <type
       format="ttf"
       name="Krungthep"
       fullname="Krungthep"
       family="Krungthep"
-     glyphs="Krungthep.ttf"
+     glyphs="/Krungthep.ttf"
       />
    <type
       format="ttf"
       name="KufiStandardGK"
       fullname="KufiStandardGK"
       family="KufiStandardGK"
-     glyphs="KufiStandardGK.ttf"
+     glyphs="/KufiStandardGK.ttf"
       />
    <type
       format="ttf"
       name="Symbol"
       fullname="Symbol"
       family="Symbol"
-     glyphs="MathSymbol.ttf"
+     glyphs="/MathSymbol.ttf"
       />
    <type
       format="ttf"
       name="Batang"
       fullname="Batang"
       family="Batang"
-     glyphs="Microsoft/Batang.ttf"
+     glyphs="/Microsoft/Batang.ttf"
       />
    <type
       format="ttf"
       name="BookshelfSymbol7"
       fullname="Bookshelf Symbol 7"
       family="Bookshelf Symbol 7"
-     glyphs="Microsoft/Bookshelf Symbol 7.ttf"
+     glyphs="/Microsoft/Bookshelf Symbol 7.ttf"
       />
    <type
       format="ttf"
       name="BrushScriptI"
       fullname="Brush Script MT Italic"
       family="Brush Script "
-     glyphs="Microsoft/Brush Script.ttf"
+     glyphs="/Microsoft/Brush Script.ttf"
       />
    <type
       format="ttf"
       name="CalibriBI"
       fullname="Calibri Bold Italic"
       family="Calibri"
-     glyphs="Microsoft/Calibri Bold Italic.ttf"
+     glyphs="/Microsoft/Calibri Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="CalibriB"
       fullname="Calibri Bold"
       family="Calibri"
-     glyphs="Microsoft/Calibri Bold.ttf"
+     glyphs="/Microsoft/Calibri Bold.ttf"
       />
    <type
       format="ttf"
       name="CalibriI"
       fullname="Calibri Italic"
       family="Calibri"
-     glyphs="Microsoft/Calibri Italic.ttf"
+     glyphs="/Microsoft/Calibri Italic.ttf"
       />
    <type
       format="ttf"
       name="Calibri"
       fullname="Calibri"
       family="Calibri"
-     glyphs="Microsoft/Calibri.ttf"
+     glyphs="/Microsoft/Calibri.ttf"
       />
    <type
       format="ttf"
       name="CambriaBI"
       fullname="Cambria Bold Italic"
       family="Cambria"
-     glyphs="Microsoft/Cambria Bold Italic.ttf"
+     glyphs="/Microsoft/Cambria Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="CambriaB"
       fullname="Cambria Bold"
       family="Cambria"
-     glyphs="Microsoft/Cambria Bold.ttf"
+     glyphs="/Microsoft/Cambria Bold.ttf"
       />
    <type
       format="ttf"
       name="CambriaI"
       fullname="Cambria Italic"
       family="Cambria"
-     glyphs="Microsoft/Cambria Italic.ttf"
+     glyphs="/Microsoft/Cambria Italic.ttf"
       />
    <type
       format="ttf"
       name="Cambria"
       fullname="Cambria"
       family="Cambria"
-     glyphs="Microsoft/Cambria.ttf"
+     glyphs="/Microsoft/Cambria.ttf"
       />
    <type
       format="ttf"
       name="CandaraBI"
       fullname="Candara Bold Italic"
       family="Candara"
-     glyphs="Microsoft/Candara Bold Italic.ttf"
+     glyphs="/Microsoft/Candara Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="CandaraB"
       fullname="Candara Bold"
       family="Candara"
-     glyphs="Microsoft/Candara Bold.ttf"
+     glyphs="/Microsoft/Candara Bold.ttf"
       />
    <type
       format="ttf"
       name="CandaraI"
       fullname="Candara Italic"
       family="Candara"
-     glyphs="Microsoft/Candara Italic.ttf"
+     glyphs="/Microsoft/Candara Italic.ttf"
       />
    <type
       format="ttf"
       name="Candara"
       fullname="Candara"
       family="Candara"
-     glyphs="Microsoft/Candara.ttf"
+     glyphs="/Microsoft/Candara.ttf"
       />
    <type
       format="ttf"
       name="ConsolasBI"
       fullname="Consolas Bold Italic"
       family="Consolas"
-     glyphs="Microsoft/Consolas Bold Italic.ttf"
+     glyphs="/Microsoft/Consolas Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="ConsolasB"
       fullname="Consolas Bold"
       family="Consolas"
-     glyphs="Microsoft/Consolas Bold.ttf"
+     glyphs="/Microsoft/Consolas Bold.ttf"
       />
    <type
       format="ttf"
       name="ConsolasI"
       fullname="Consolas Italic"
       family="Consolas"
-     glyphs="Microsoft/Consolas Italic.ttf"
+     glyphs="/Microsoft/Consolas Italic.ttf"
       />
    <type
       format="ttf"
       name="Consolas"
       fullname="Consolas"
       family="Consolas"
-     glyphs="Microsoft/Consolas.ttf"
+     glyphs="/Microsoft/Consolas.ttf"
       />
    <type
       format="ttf"
       name="ConstantiaTestI"
       fullname="Constantia Test Italic"
       family="Constantia"
-     glyphs="Microsoft/Constantia Bold Italic.ttf"
+     glyphs="/Microsoft/Constantia Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="ConstantiaB"
       fullname="Constantia Bold"
       family="Constantia"
-     glyphs="Microsoft/Constantia Bold.ttf"
+     glyphs="/Microsoft/Constantia Bold.ttf"
       />
    <type
       format="ttf"
       name="ConstantiaI"
       fullname="Constantia Italic"
       family="Constantia"
-     glyphs="Microsoft/Constantia Italic.ttf"
+     glyphs="/Microsoft/Constantia Italic.ttf"
       />
    <type
       format="ttf"
       name="Constantia"
       fullname="Constantia"
       family="Constantia"
-     glyphs="Microsoft/Constantia.ttf"
+     glyphs="/Microsoft/Constantia.ttf"
       />
    <type
       format="ttf"
       name="CorbelTestBI"
       fullname="Corbel Test Bold Italic"
       family="Corbel"
-     glyphs="Microsoft/Corbel Bold Italic.ttf"
+     glyphs="/Microsoft/Corbel Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="CorbelTestB"
       fullname="Corbel Test Bold"
       family="Corbel"
-     glyphs="Microsoft/Corbel Bold.ttf"
+     glyphs="/Microsoft/Corbel Bold.ttf"
       />
    <type
       format="ttf"
       name="CorbelI"
       fullname="Corbel Italic"
       family="Corbel"
-     glyphs="Microsoft/Corbel Italic.ttf"
+     glyphs="/Microsoft/Corbel Italic.ttf"
       />
    <type
       format="ttf"
       name="Corbel"
       fullname="Corbel"
       family="Corbel"
-     glyphs="Microsoft/Corbel.ttf"
+     glyphs="/Microsoft/Corbel.ttf"
       />
    <type
       format="ttf"
       name="FranklinGothicBookI"
       fullname="Franklin Gothic Book Italic"
       family="Franklin Gothic Book"
-     glyphs="Microsoft/Franklin Gothic Book Italic.ttf"
+     glyphs="/Microsoft/Franklin Gothic Book Italic.ttf"
       />
    <type
       format="ttf"
       name="FranklinGothicBook"
       fullname="Franklin Gothic Book"
       family="Franklin Gothic Book"
-     glyphs="Microsoft/Franklin Gothic Book.ttf"
+     glyphs="/Microsoft/Franklin Gothic Book.ttf"
       />
    <type
       format="ttf"
       name="FranklinGothicMI"
       fullname="Franklin Gothic Medium Italic"
       family="Franklin Gothic Medium"
-     glyphs="Microsoft/Franklin Gothic Medium Italic.ttf"
+     glyphs="/Microsoft/Franklin Gothic Medium Italic.ttf"
       />
    <type
       format="ttf"
       name="FranklinGothicM"
       fullname="Franklin Gothic Medium"
       family="Franklin Gothic Medium"
-     glyphs="Microsoft/Franklin Gothic Medium.ttf"
+     glyphs="/Microsoft/Franklin Gothic Medium.ttf"
       />
    <type
       format="ttf"
       name="GillSansBI"
       fullname="Gill Sans MT Bold Italic"
       family="Gill Sans "
-     glyphs="Microsoft/Gill Sans MT Bold Italic.ttf"
+     glyphs="/Microsoft/Gill Sans MT Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="GillSansB"
       fullname="Gill Sans MT Bold"
       family="Gill Sans "
-     glyphs="Microsoft/Gill Sans MT Bold.ttf"
+     glyphs="/Microsoft/Gill Sans MT Bold.ttf"
       />
    <type
       format="ttf"
       name="GillSansI"
       fullname="Gill Sans MT Italic"
       family="Gill Sans "
-     glyphs="Microsoft/Gill Sans MT Italic.ttf"
+     glyphs="/Microsoft/Gill Sans MT Italic.ttf"
       />
    <type
       format="ttf"
       name="GillSans"
       fullname="Gill Sans MT"
       family="Gill Sans "
-     glyphs="Microsoft/Gill Sans MT.ttf"
+     glyphs="/Microsoft/Gill Sans MT.ttf"
       />
    <type
       format="ttf"
       name="Gulim"
       fullname="Gulim"
       family="Gulim"
-     glyphs="Microsoft/Gulim.ttf"
+     glyphs="/Microsoft/Gulim.ttf"
       />
    <type
       format="ttf"
       name="LucidaConsole"
       fullname="Lucida Console"
       family="Lucida Console"
-     glyphs="Microsoft/Lucida Console.ttf"
+     glyphs="/Microsoft/Lucida Console.ttf"
       />
    <type
       format="ttf"
       name="LucidaSansUnicode"
       fullname="Lucida Sans Unicode"
       family="Lucida Sans Unicode"
-     glyphs="Microsoft/Lucida Sans Unicode.ttf"
+     glyphs="/Microsoft/Lucida Sans Unicode.ttf"
       />
    <type
       format="ttf"
       name="Marlett"
       fullname="Marlett"
       family="Marlett"
-     glyphs="Microsoft/Marlett.ttf"
+     glyphs="/Microsoft/Marlett.ttf"
       />
    <type
       format="ttf"
       name="MeiryoBI"
       fullname="Meiryo Bold Italic"
       family="Meiryo"
-     glyphs="Microsoft/Meiryo Bold Italic.ttf"
+     glyphs="/Microsoft/Meiryo Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="MeiryoB"
       fullname="Meiryo Bold"
       family="Meiryo"
-     glyphs="Microsoft/Meiryo Bold.ttf"
+     glyphs="/Microsoft/Meiryo Bold.ttf"
       />
    <type
       format="ttf"
       name="MeiryoI"
       fullname="Meiryo Italic"
       family="Meiryo"
-     glyphs="Microsoft/Meiryo Italic.ttf"
+     glyphs="/Microsoft/Meiryo Italic.ttf"
       />
    <type
       format="ttf"
       name="Meiryo"
       fullname="Meiryo"
       family="Meiryo"
-     glyphs="Microsoft/Meiryo.ttf"
+     glyphs="/Microsoft/Meiryo.ttf"
       />
    <type
       format="ttf"
       name="Gothic"
       fullname="MS Gothic"
       family="Gothic"
-     glyphs="Microsoft/MS Gothic.ttf"
+     glyphs="/Microsoft/MS Gothic.ttf"
       />
    <type
       format="ttf"
       name="Mincho"
       fullname="MS Mincho"
       family="Mincho"
-     glyphs="Microsoft/MS Mincho.ttf"
+     glyphs="/Microsoft/MS Mincho.ttf"
       />
    <type
       format="ttf"
       name="PGothic"
       fullname="MS PGothic"
       family="PGothic"
-     glyphs="Microsoft/MS PGothic.ttf"
+     glyphs="/Microsoft/MS PGothic.ttf"
       />
    <type
       format="ttf"
       name="PMincho"
       fullname="MS PMincho"
       family="PMincho"
-     glyphs="Microsoft/MS PMincho.ttf"
+     glyphs="/Microsoft/MS PMincho.ttf"
       />
    <type
       format="ttf"
       name="ReferenceSansSerif"
       fullname="MS Reference Sans Serif"
       family="Reference Sans Serif"
-     glyphs="Microsoft/MS Reference Sans Serif.ttf"
+     glyphs="/Microsoft/MS Reference Sans Serif.ttf"
       />
    <type
       format="ttf"
       name="ReferenceSpecialty"
       fullname="MS Reference Specialty"
       family="Reference Specialty"
-     glyphs="Microsoft/MS Reference Specialty.ttf"
+     glyphs="/Microsoft/MS Reference Specialty.ttf"
       />
    <type
       format="ttf"
       name="PerpetuaBI"
       fullname="Perpetua Bold Italic"
       family="Perpetua"
-     glyphs="Microsoft/Perpetua Bold Italic.ttf"
+     glyphs="/Microsoft/Perpetua Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="PerpetuaB"
       fullname="Perpetua Bold"
       family="Perpetua"
-     glyphs="Microsoft/Perpetua Bold.ttf"
+     glyphs="/Microsoft/Perpetua Bold.ttf"
       />
    <type
       format="ttf"
       name="PerpetuaI"
       fullname="Perpetua Italic"
       family="Perpetua"
-     glyphs="Microsoft/Perpetua Italic.ttf"
+     glyphs="/Microsoft/Perpetua Italic.ttf"
       />
    <type
       format="ttf"
       name="Perpetua"
       fullname="Perpetua"
       family="Perpetua"
-     glyphs="Microsoft/Perpetua.ttf"
+     glyphs="/Microsoft/Perpetua.ttf"
       />
    <type
       format="ttf"
       name="PMingLiU"
       fullname="PMingLiU"
       family="PMingLiU"
-     glyphs="Microsoft/PMingLiU.ttf"
+     glyphs="/Microsoft/PMingLiU.ttf"
       />
    <type
       format="ttf"
       name="SimSun"
       fullname="SimSun"
       family="SimSun"
-     glyphs="Microsoft/SimSun.ttf"
+     glyphs="/Microsoft/SimSun.ttf"
       />
    <type
       format="ttf"
       name="TwCenBI"
       fullname="Tw Cen MT Bold Italic"
       family="Tw Cen "
-     glyphs="Microsoft/Tw Cen MT Bold Italic.ttf"
+     glyphs="/Microsoft/Tw Cen MT Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="TwCenB"
       fullname="Tw Cen MT Bold"
       family="Tw Cen "
-     glyphs="Microsoft/Tw Cen MT Bold.ttf"
+     glyphs="/Microsoft/Tw Cen MT Bold.ttf"
       />
    <type
       format="ttf"
       name="TwCenI"
       fullname="Tw Cen MT Italic"
       family="Tw Cen "
-     glyphs="Microsoft/Tw Cen MT Italic.ttf"
+     glyphs="/Microsoft/Tw Cen MT Italic.ttf"
       />
    <type
       format="ttf"
       name="TwCen"
       fullname="Tw Cen MT"
       family="Tw Cen "
-     glyphs="Microsoft/Tw Cen MT.ttf"
+     glyphs="/Microsoft/Tw Cen MT.ttf"
       />
    <type
       format="ttf"
       name="MicrosoftSansSerif"
       fullname="Microsoft Sans Serif"
       family="Microsoft Sans Serif"
-     glyphs="Microsoft Sans Serif.ttf"
+     glyphs="/Microsoft Sans Serif.ttf"
       />
    <type
       format="ttf"
       name="Gothic"
       fullname="MS Gothic"
       family="Gothic"
-     glyphs="MS Gothic.ttf"
+     glyphs="/MS Gothic.ttf"
       />
    <type
       format="ttf"
       name="Mincho"
       fullname="MS Mincho"
       family="Mincho"
-     glyphs="MS Mincho.ttf"
+     glyphs="/MS Mincho.ttf"
       />
    <type
       format="ttf"
       name="PGothic"
       fullname="MS PGothic"
       family="PGothic"
-     glyphs="MS PGothic.ttf"
+     glyphs="/MS PGothic.ttf"
       />
    <type
       format="ttf"
       name="PMincho"
       fullname="MS PMincho"
       family="PMincho"
-     glyphs="MS PMincho.ttf"
+     glyphs="/MS PMincho.ttf"
       />
    <type
       format="ttf"
       name="MshtakanB"
       fullname="Mshtakan Bold"
       family="Mshtakan"
-     glyphs="MshtakanBold.ttf"
+     glyphs="/MshtakanBold.ttf"
       />
    <type
       format="ttf"
       name="MshtakanBoldOblique"
       fullname="Mshtakan BoldOblique"
       family="Mshtakan"
-     glyphs="MshtakanBoldOblique.ttf"
+     glyphs="/MshtakanBoldOblique.ttf"
       />
    <type
       format="ttf"
       name="MshtakanOb"
       fullname="Mshtakan Oblique"
       family="Mshtakan"
-     glyphs="MshtakanOblique.ttf"
+     glyphs="/MshtakanOblique.ttf"
       />
    <type
       format="ttf"
       name="Mshtakan"
       fullname="Mshtakan"
       family="Mshtakan"
-     glyphs="MshtakanRegular.ttf"
+     glyphs="/MshtakanRegular.ttf"
       />
    <type
       format="ttf"
       name="Nadeem"
       fullname="Nadeem"
       family="Nadeem"
-     glyphs="Nadeem.ttf"
+     glyphs="/Nadeem.ttf"
       />
    <type
       format="ttf"
       name="NewPeninim"
       fullname="New Peninim MT"
       family="New Peninim "
-     glyphs="NewPeninimMT.ttf"
+     glyphs="/NewPeninimMT.ttf"
       />
    <type
       format="ttf"
       name="NewPeninimB"
       fullname="New Peninim MT Bold"
       family="New Peninim "
-     glyphs="NewPeninimMTBold.ttf"
+     glyphs="/NewPeninimMTBold.ttf"
       />
    <type
       format="ttf"
       name="NewPeninimBInclined"
       fullname="New Peninim MT Bold Inclined"
       family="New Peninim "
-     glyphs="NewPeninimMTBoldInclined.ttf"
+     glyphs="/NewPeninimMTBoldInclined.ttf"
       />
    <type
       format="ttf"
       name="NewPeninimInclined"
       fullname="New Peninim MT Inclined"
       family="New Peninim "
-     glyphs="NewPeninimMTInclined.ttf"
+     glyphs="/NewPeninimMTInclined.ttf"
       />
    <type
       format="ttf"
       name="GB18030Bitmap"
       fullname="GB18030 Bitmap"
       family="GB18030 Bitmap"
-     glyphs="NISC18030.ttf"
+     glyphs="/NISC18030.ttf"
       />
    <type
       format="ttf"
       name="OpenSansB"
       fullname="Open Sans Bold"
       family="Open Sans"
-     glyphs="OpenSans-Bold.ttf"
+     glyphs="/OpenSans-Bold.ttf"
       />
    <type
       format="ttf"
       name="OpenSansBI"
       fullname="Open Sans Bold Italic"
       family="Open Sans"
-     glyphs="OpenSans-BoldItalic.ttf"
+     glyphs="/OpenSans-BoldItalic.ttf"
       />
    <type
       format="ttf"
       name="OpenSansXb"
       fullname="Open Sans Extrabold"
       family="Open Sans Extrabold"
-     glyphs="OpenSans-ExtraBold.ttf"
+     glyphs="/OpenSans-ExtraBold.ttf"
       />
    <type
       format="ttf"
       name="OpenSansXbI"
       fullname="Open Sans Extrabold Italic"
       family="Open Sans Extrabold"
-     glyphs="OpenSans-ExtraBoldItalic.ttf"
+     glyphs="/OpenSans-ExtraBoldItalic.ttf"
       />
    <type
       format="ttf"
       name="OpenSansI"
       fullname="Open Sans Italic"
       family="Open Sans"
-     glyphs="OpenSans-Italic.ttf"
+     glyphs="/OpenSans-Italic.ttf"
       />
    <type
       format="ttf"
       name="OpenSansL"
       fullname="Open Sans Light"
       family="Open Sans Light"
-     glyphs="OpenSans-Light.ttf"
+     glyphs="/OpenSans-Light.ttf"
       />
    <type
       format="ttf"
       name="OpenSansLI"
       fullname="Open Sans Light Italic"
       family="Open Sans Light"
-     glyphs="OpenSans-LightItalic.ttf"
+     glyphs="/OpenSans-LightItalic.ttf"
       />
    <type
       format="ttf"
       name="OpenSans"
       fullname="Open Sans"
       family="Open Sans"
-     glyphs="OpenSans-Regular.ttf"
+     glyphs="/OpenSans-Regular.ttf"
       />
    <type
       format="ttf"
       name="OpenSansSemibold"
       fullname="Open Sans Semibold"
       family="Open Sans Semibold"
-     glyphs="OpenSans-Semibold.ttf"
+     glyphs="/OpenSans-Semibold.ttf"
       />
    <type
       format="ttf"
       name="OpenSansSemiboldI"
       fullname="Open Sans Semibold Italic"
       family="Open Sans Semibold"
-     glyphs="OpenSans-SemiboldItalic.ttf"
+     glyphs="/OpenSans-SemiboldItalic.ttf"
       />
    <type
       format="ttf"
       name="Osaka"
       fullname="Osaka"
       family="Osaka"
-     glyphs="Osaka.ttf"
+     glyphs="/Osaka.ttf"
       />
    <type
       format="ttf"
       name="OsakaMono"
       fullname="Osaka-Mono"
       family="Osaka"
-     glyphs="OsakaMono.ttf"
+     glyphs="/OsakaMono.ttf"
       />
    <type
       format="ttf"
       name="PCMyungjo"
       fullname="PCMyungjo Regular"
       family="PCMyungjo"
-     glyphs="PCmyoungjo.ttf"
+     glyphs="/PCmyoungjo.ttf"
       />
    <type
       format="ttf"
       name="Pharmacy"
       fullname="Pharmacy"
       family="Pharmacy"
-     glyphs="Pharmacy.ttf"
+     glyphs="/Pharmacy.ttf"
       />
    <type
       format="ttf"
       name="PilGi"
       fullname="PilGi Regular"
       family="PilGi"
-     glyphs="Pilgiche.ttf"
+     glyphs="/Pilgiche.ttf"
       />
    <type
       format="ttf"
       name="PlantagenetCherokee"
       fullname="Plantagenet Cherokee"
       family="Plantagenet Cherokee"
-     glyphs="PlantagenetCherokee.ttf"
+     glyphs="/PlantagenetCherokee.ttf"
       />
    <type
       format="ttf"
       name="Raanana"
       fullname="Raanana"
       family="Raanana"
-     glyphs="Raanana.ttf"
+     glyphs="/Raanana.ttf"
       />
    <type
       format="ttf"
       name="RaananaB"
       fullname="Raanana Bold"
       family="Raanana"
-     glyphs="RaananaBold.ttf"
+     glyphs="/RaananaBold.ttf"
       />
    <type
       format="ttf"
       name="Sathu"
       fullname="Sathu"
       family="Sathu"
-     glyphs="Sathu.ttf"
+     glyphs="/Sathu.ttf"
       />
    <type
       format="ttf"
       name="Silom"
       fullname="Silom"
       family="Silom"
-     glyphs="Silom.ttf"
+     glyphs="/Silom.ttf"
       />
    <type
       format="ttf"
       name="SimSun"
       fullname="SimSun"
       family="SimSun"
-     glyphs="SimSun.ttf"
+     glyphs="/SimSun.ttf"
       />
    <type
       format="ttf"
       name="Skia"
       fullname="Skia Regular"
       family="Skia"
-     glyphs="Skia.ttf"
+     glyphs="/Skia.ttf"
       />
    <type
       format="ttf"
       name="Starburst"
       fullname="Starburst Regular"
       family="Starburst"
-     glyphs="starburst.ttf"
+     glyphs="/starburst.ttf"
       />
    <type
       format="ttf"
       name="Symbol"
       fullname="Symbol"
       family="Symbol"
-     glyphs="Symbol.ttf"
+     glyphs="/Symbol.ttf"
       />
    <type
       format="ttf"
       name="TahomaB"
       fullname="Tahoma Bold"
       family="Tahoma"
-     glyphs="Tahoma Bold.ttf"
+     glyphs="/Tahoma Bold.ttf"
       />
    <type
       format="ttf"
       name="Tahoma"
       fullname="Tahoma"
       family="Tahoma"
-     glyphs="Tahoma.ttf"
+     glyphs="/Tahoma.ttf"
       />
    <type
       format="ttf"
       name="TimesNewRomanBI"
       fullname="Times New Roman Bold Italic"
       family="Times New Roman"
-     glyphs="Times New Roman Bold Italic.ttf"
+     glyphs="/Times New Roman Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="TimesNewRomanB"
       fullname="Times New Roman Bold"
       family="Times New Roman"
-     glyphs="Times New Roman Bold.ttf"
+     glyphs="/Times New Roman Bold.ttf"
       />
    <type
       format="ttf"
       name="TimesNewRomanI"
       fullname="Times New Roman Italic"
       family="Times New Roman"
-     glyphs="Times New Roman Italic.ttf"
+     glyphs="/Times New Roman Italic.ttf"
       />
    <type
       format="ttf"
       name="TimesNewRoman"
       fullname="Times New Roman"
       family="Times New Roman"
-     glyphs="Times New Roman.ttf"
+     glyphs="/Times New Roman.ttf"
       />
    <type
       format="ttf"
       name="TrebuchetMSBI"
       fullname="Trebuchet MS Bold Italic"
       family="Trebuchet"
-     glyphs="Trebuchet MS Bold Italic.ttf"
+     glyphs="/Trebuchet MS Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="TrebuchetMSB"
       fullname="Trebuchet MS Bold"
       family="Trebuchet"
-     glyphs="Trebuchet MS Bold.ttf"
+     glyphs="/Trebuchet MS Bold.ttf"
       />
    <type
       format="ttf"
       name="TrebuchetMSI"
       fullname="Trebuchet MS Italic"
       family="Trebuchet"
-     glyphs="Trebuchet MS Italic.ttf"
+     glyphs="/Trebuchet MS Italic.ttf"
       />
    <type
       format="ttf"
       name="Trebuchet"
       fullname="Trebuchet MS"
       family="Trebuchet"
-     glyphs="Trebuchet MS.ttf"
+     glyphs="/Trebuchet MS.ttf"
       />
    <type
       format="ttf"
       name="Vademecum"
       fullname="Vademecum"
       family="Vademecum"
-     glyphs="vademecu.ttf"
+     glyphs="/vademecu.ttf"
       />
    <type
       format="ttf"
       name="VerdanaBI"
       fullname="Verdana Bold Italic"
       family="Verdana"
-     glyphs="Verdana Bold Italic.ttf"
+     glyphs="/Verdana Bold Italic.ttf"
       />
    <type
       format="ttf"
       name="VerdanaB"
       fullname="Verdana Bold"
       family="Verdana"
-     glyphs="Verdana Bold.ttf"
+     glyphs="/Verdana Bold.ttf"
       />
    <type
       format="ttf"
       name="VerdanaI"
       fullname="Verdana Italic"
       family="Verdana"
-     glyphs="Verdana Italic.ttf"
+     glyphs="/Verdana Italic.ttf"
       />
    <type
       format="ttf"
       name="Verdana"
       fullname="Verdana"
       family="Verdana"
-     glyphs="Verdana.ttf"
+     glyphs="/Verdana.ttf"
       />
    <type
       format="ttf"
       name="Webdings"
       fullname="Webdings"
       family="Webdings"
-     glyphs="Webdings.ttf"
+     glyphs="/Webdings.ttf"
       />
    <type
       format="ttf"
       name="Wingdings2"
       fullname="Wingdings 2"
       family="Wingdings 2"
-     glyphs="Wingdings 2.ttf"
+     glyphs="/Wingdings 2.ttf"
       />
    <type
       format="ttf"
       name="Wingdings3"
       fullname="Wingdings 3"
       family="Wingdings 3"
-     glyphs="Wingdings 3.ttf"
+     glyphs="/Wingdings 3.ttf"
       />
    <type
       format="ttf"
       name="Wingdings"
       fullname="Wingdings"
       family="Wingdings"
-     glyphs="Wingdings.ttf"
+     glyphs="/Wingdings.ttf"
       />
    <type
       format="ttf"
       name="Zapfino"
       fullname="Zapfino"
       family="Zapfino"
-     glyphs="Zapfino.ttf"
+     glyphs="/Zapfino.ttf"
       />
    <type
       format="ttf"
       name="Zymbols"
       fullname="Zymbols"
       family="Zymbols"
-     glyphs="Zymbols.ttf"
+     glyphs="/Zymbols.ttf"
       />
    <type
       format="ttf"
       name="LiSongPro"
       fullname="LiSong Pro"
       family="LiSong Pro"
-     glyphs="å\84·å®\8b Pro.ttf"
+     glyphs="/å\84·å®\8b Pro.ttf"
       />
    <type
       format="ttf"
       name="STFangsong"
       fullname="STFangsong"
       family="STFangsong"
-     glyphs="å\8d\8eæ\96\87ä»¿å®\8b.ttf"
+     glyphs="/å\8d\8eæ\96\87ä»¿å®\8b.ttf"
       />
    <type
       format="ttf"
       name="STSong"
       fullname="STSong"
       family="STSong"
-     glyphs="å\8d\8eæ\96\87å®\8bä½\93.ttf"
+     glyphs="/å\8d\8eæ\96\87å®\8bä½\93.ttf"
       />
    <type
       format="ttf"
       name="STKaiti"
       fullname="STKaiti"
       family="STKaiti"
-     glyphs="å\8d\8eæ\96\87æ¥·ä½\93.ttf"
+     glyphs="/å\8d\8eæ\96\87æ¥·ä½\93.ttf"
       />
  </typemap>
diff --git a/ImageMagick-6/type-dejavu.xml b/ImageMagick-6/type-dejavu.xml

index 0db1fc8e93a13908da2409cc9b3023e4ce6a8a6d..29b3c2047e8c0949fdd7faaed4912753fda8f61c 100644 (file)
--- a/ImageMagick-6/type-dejavu.xml
+++ b/ImageMagick-6/type-dejavu.xml
@@ -1,21 +1,17 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE typemap [
-<!ELEMENT typemap (type)+>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST type name CDATA #REQUIRED>
-<!ATTLIST type fullname CDATA #IMPLIED>
-<!ATTLIST type fullname="" family CDATA #IMPLIED>
-<!ATTLIST type foundry CDATA #IMPLIED>
-<!ATTLIST type weight CDATA #IMPLIED>
-<!ATTLIST type style CDATA #IMPLIED>
-<!ATTLIST type stretch CDATA #IMPLIED>
-<!ATTLIST type format CDATA #IMPLIED>
-<!ATTLIST type metrics CDATA #IMPLIED>
-<!ATTLIST type glyphs CDATA #REQUIRED>
-<!ATTLIST type version CDATA #IMPLIED>
-<!ATTLIST include file CDATA #REQUIRED>
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
  ]>
+<!--
+  ImageMagick DejaVU font configuration.
+-->
  <typemap>
    <type name="DejaVu-LGC-Sans-Bold" fullname="DejaVu LGC Sans Bold" family="DejaVuGC Sans" style="Normal" stretch="Normal" weight="700" glyphs="DejaVuLGCSans-Bold.ttf"/>
    <type name="DejaVu-LGC-Sans-Bold-Oblique" fullname="DejaVu LGC Sans Bold Oblique" family="DejaVuGC Sans" style="Oblique" stretch="Normal" weight="700" glyphs="DejaVuLGCSans-BoldOblique.ttf"/>
diff --git a/ImageMagick-6/type-ghostscript.xml b/ImageMagick-6/type-ghostscript.xml

index d8d554b979723739af88b1a9a9e92c4361d5c17e..b5162310af9ef2e59e2a8d964acb34b470f91f89 100644 (file)
--- a/ImageMagick-6/type-ghostscript.xml
+++ b/ImageMagick-6/type-ghostscript.xml
@@ -1,21 +1,17 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE typemap [
-<!ELEMENT typemap (type)+>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST type name CDATA #REQUIRED>
-<!ATTLIST type fullname CDATA #IMPLIED>
-<!ATTLIST type family CDATA #IMPLIED>
-<!ATTLIST type foundry CDATA #IMPLIED>
-<!ATTLIST type weight CDATA #IMPLIED>
-<!ATTLIST type style CDATA #IMPLIED>
-<!ATTLIST type stretch CDATA #IMPLIED>
-<!ATTLIST type format CDATA #IMPLIED>
-<!ATTLIST type metrics CDATA #IMPLIED>
-<!ATTLIST type glyphs CDATA #REQUIRED>
-<!ATTLIST type version CDATA #IMPLIED>
-<!ATTLIST include file CDATA #REQUIRED>
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
  ]>
+<!--
+  ImageMagick Ghostscript font configuration.
+-->
  <typemap>
    <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/gsfonts/a010013l.afm" glyphs="/usr/share/fonts/type1/gsfonts/a010013l.pfb"/>
    <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="/usr/share/fonts/type1/gsfonts/a010033l.afm" glyphs="/usr/share/fonts/type1/gsfonts/a010033l.pfb"/>
diff --git a/ImageMagick-6/type-urw-base35.xml b/ImageMagick-6/type-urw-base35.xml

new file mode 100644 (file)

index 0000000..2f70e72
--- /dev/null
+++ b/ImageMagick-6/type-urw-base35.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE typemap [
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
+]>
+<!--
+  ImageMagick URW-base35 font configuration.
+-->
+<typemap>
+  <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="URWGothic-Book.afm" glyphs="URWGothic-Book.t1"/>
+  <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="URWGothic-BookOblique.afm" glyphs="URWGothic-BookOblique.t1"/>
+  <type name="AvantGarde-Demi" fullname="AvantGarde DemiBold" family="AvantGarde" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="URWGothic-Demi.afm" glyphs="URWGothic-Demi.t1"/>
+  <type name="AvantGarde-DemiOblique" fullname="AvantGarde DemiOblique" family="AvantGarde" foundry="URW" weight="600" style="oblique" stretch="normal" format="type1" metrics="URWGothic-DemiOblique.afm" glyphs="URWGothic-DemiOblique.t1"/>
+  <type name="Bookman-Demi" fullname="Bookman DemiBold" family="Bookman" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="URWBookman-Demi.afm" glyphs="URWBookman-Demi.t1"/>
+  <type name="Bookman-DemiItalic" fullname="Bookman DemiBold Italic" family="Bookman" foundry="URW" weight="600" style="italic" stretch="normal" format="type1" metrics="URWBookman-DemiItalic.afm" glyphs="URWBookman-DemiItalic.t1"/>
+  <type name="Bookman-Light" fullname="Bookman Light" family="Bookman" foundry="URW" weight="300" style="normal" stretch="normal" format="type1" metrics="URWBookman-Light.afm" glyphs="URWBookman-Light.t1"/>
+  <type name="Bookman-LightItalic" fullname="Bookman Light Italic" family="Bookman" foundry="URW" weight="300" style="italic" stretch="normal" format="type1" metrics="URWBookman-LightItalic.afm" glyphs="URWBookman-LightItalic.t1"/>
+  <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="NimbusMonoPS-Refular.afm" glyphs="NimbusMonoPS-Regular.t1"/>
+  <type name="Courier-Bold" fullname="Courier Bold" family="Courier" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="NimbusMonoPS-Bold.afm" glyphs="NimbusMonoPS-Bold.t1"/>
+  <type name="Courier-Oblique" fullname="Courier Regular Oblique" family="Courier" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="NimbusMonoPS-Italic.afm" glyphs="NimbusMonoPS-Italic.t1"/>
+  <type name="Courier-BoldOblique" fullname="Courier Bold Oblique" family="Courier" foundry="URW" weight="700" style="oblique" stretch="normal" format="type1" metrics="NimbusMonoPS-BoldItalic.afm" glyphs="NimbusMonoPS-BoldItalic.t1"/>
+  <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="NimbusSans-Regular.afm" glyphs="NimbusSans-Regular.t1"/>
+  <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="NimbusSans-Regular.afm" glyphs="NimbusSans-Regular.t1"/>
+  <type name="Helvetica-Bold" fullname="Helvetica Bold" family="Helvetica" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="NimbusSans-Bold.afm" glyphs="NimbusSans-Bold.t1"/>
+  <type name="Helvetica-Oblique" fullname="Helvetica Regular Italic" family="Helvetica" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="NimbusSans-Italic.afm" glyphs="NimbusSans-Italic.t1"/>
+  <type name="Helvetica-BoldOblique" fullname="Helvetica Bold Italic" family="Helvetica" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="NimbusSans-BoldItalic.afm" glyphs="NimbusSans-BoldItalic.t1"/>
+  <type name="Helvetica-Narrow" fullname="Helvetica Narrow" family="Helvetica Narrow" foundry="URW" weight="400" style="normal" stretch="condensed" format="type1" metrics="NimbusSansNarrow-Regular.afm" glyphs="NimbusSansNarrow-Regular.t1"/>
+  <type name="Helvetica-Narrow-Oblique" fullname="Helvetica Narrow Oblique" family="Helvetica Narrow" foundry="URW" weight="400" style="oblique" stretch="condensed" format="type1" metrics="NimbusSansNarrow-Oblique.afm" glyphs="NimbusSansNarrow-Oblique.t1"/>
+  <type name="Helvetica-Narrow-Bold" fullname="Helvetica Narrow Bold" family="Helvetica Narrow" foundry="URW" weight="700" style="normal" stretch="condensed" format="type1" metrics="NimbusSansNarrow-Bold.afm" glyphs="NimbusSansNarrow-Bold.t1"/>
+  <type name="Helvetica-Narrow-BoldOblique" fullname="Helvetica Narrow Bold Oblique" family="Helvetica Narrow" foundry="URW" weight="700" style="oblique" stretch="condensed" format="type1" metrics="nNimbusSansNarrow-BdOblique.afm" glyphs="NimbusSansNarrow-BdOblique.t1"/>
+  <type name="NewCenturySchlbk-Roman" fullname="New Century Schoolbook" family="NewCenturySchlbk" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="C059-Roman.afm" glyphs="C059-Roman.t1"/>
+  <type name="NewCenturySchlbk-Italic" fullname="New Century Schoolbook Italic" family="NewCenturySchlbk" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="C059-Italic.afm" glyphs="C059-Italic.t1"/>
+  <type name="NewCenturySchlbk-Bold" fullname="New Century Schoolbook Bold" family="NewCenturySchlbk" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="C059-Bold.afm" glyphs="C059-Bold.t1"/>
+  <type name="NewCenturySchlbk-BoldItalic" fullname="New Century Schoolbook Bold Italic" family="NewCenturySchlbk" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="C059-BdIta.afm" glyphs="C059-BdIta.t1"/>
+  <type name="Palatino-Roman" fullname="Palatino Regular" family="Palatino" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="P052-Roman.afm" glyphs="P052-Roman.t1"/>
+  <type name="Palatino-Italic" fullname="Palatino Italic" family="Palatino" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="P052-Italic.afm" glyphs="P052-Italic.t1"/>
+  <type name="Palatino-Bold" fullname="Palatino Bold" family="Palatino" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="P052-Bold.afm" glyphs="P052-Bold.t1"/>
+  <type name="Palatino-BoldItalic" fullname="Palatino Bold Italic" family="Palatino" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="P052-BoldItalic.afm" glyphs="P052-BoldItalic.t1"/>
+  <type name="Times-Roman" fullname="Times Regular" family="Times" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="NimbusRoman-Regular.afm" glyphs="NimbusRoman-Regular.t1"/>
+  <type name="Times-Bold" fullname="Times Medium" family="Times" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="NimbusRoman-Bold.afm" glyphs="NimbusRoman-Bold.t1"/>
+  <type name="Times-Italic" fullname="Times Regular Italic" family="Times" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="NimbusRoman-Italic.afm" glyphs="NimbusRoman-Italic.t1"/>
+  <type name="Times-BoldItalic" fullname="Times Medium Italic" family="Times" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="NimbusRoman-BoldItalic.afm" glyphs="NimbusRoman-BoldItalic.t1"/>
+  <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="StandardSymbolsPS.afm" glyphs="StandardSymbolsPS.t1" version="2.0" encoding="AdobeCustom"/>
+</typemap>
diff --git a/ImageMagick-6/type-windows.xml b/ImageMagick-6/type-windows.xml

index d6735e0e5c11ef7de68ebad0708285694ba13d7e..621eec42f9df9875c3bc673a19687d220cd3c764 100644 (file)
--- a/ImageMagick-6/type-windows.xml
+++ b/ImageMagick-6/type-windows.xml
@@ -16,6 +16,9 @@
  <!ATTLIST type version CDATA #IMPLIED>
  <!ATTLIST include file CDATA #REQUIRED>
  ]>
+<!--
+  ImageMagick Windows font configuration.
+-->
  <typemap>
    <type name="Arial" fullname="Arial" family="Arial" weight="400" style="normal" stretch="normal" glyphs="arial.ttf"/>
    <type name="Arial-Black" fullname="Arial Black" family="Arial" weight="900" style="normal" stretch="normal" glyphs="ariblk.ttf"/>
diff --git a/ImageMagick-6/type.xml b/ImageMagick-6/type.xml

index ccf5d65dc760a336b1bfb475c9d09f7e629dbc2e..a9c39bf9c0306d1d93161426cf32973c9abfe8c9 100644 (file)
--- a/ImageMagick-6/type.xml
+++ b/ImageMagick-6/type.xml
@@ -1,21 +1,17 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE typemap [
-<!ELEMENT typemap (type)+>
-<!ELEMENT type (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST type name CDATA #REQUIRED>
-<!ATTLIST type fullname CDATA #IMPLIED>
-<!ATTLIST type family CDATA #IMPLIED>
-<!ATTLIST type foundry CDATA #IMPLIED>
-<!ATTLIST type weight CDATA #IMPLIED>
-<!ATTLIST type style CDATA #IMPLIED>
-<!ATTLIST type stretch CDATA #IMPLIED>
-<!ATTLIST type format CDATA #IMPLIED>
-<!ATTLIST type metrics CDATA #IMPLIED>
-<!ATTLIST type glyphs CDATA #REQUIRED>
-<!ATTLIST type version CDATA #IMPLIED>
-<!ATTLIST include file CDATA #REQUIRED>
+  <!ELEMENT typemap (type)+>
+  <!ATTLIST typemap xmlns CDATA #FIXED ''>
+  <!ELEMENT type EMPTY>
+  <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+    family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+    fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+    name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+    version CDATA #IMPLIED weight CDATA #REQUIRED>
  ]>
+<!--
+  ImageMagick font configuration.
+-->
  <typemap>
     <include file="type-ghostscript.xml" />
  </typemap>
diff --git a/X11/Xsession.d/55mate-session_materc b/X11/Xsession.d/55mate-session_materc

new file mode 100644 (file)

index 0000000..b285d9a
--- /dev/null
+++ b/X11/Xsession.d/55mate-session_materc
@@ -0,0 +1,23 @@
+# If we are running the MATE session, source ~/.materc
+
+BASESTARTUP=${STARTUP%% *}
+BASESTARTUP=${BASESTARTUP##*/}
+if [ "$BASESTARTUP" = x-session-manager ]; then
+    BASESTARTUP=$(basename $(readlink /etc/alternatives/x-session-manager))
+fi
+case "$BASESTARTUP" in
+  mate-session*)
+    MATERC=$HOME/.materc
+    if [ -r "$MATERC" ]; then
+      . "$MATERC"
+    fi
+    # We prepend /usr/share/mate since its defaults.list actually points
+    # to /etc so it is configurable.
+    if [ -z "$XDG_DATA_DIRS" ]; then
+      XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/
+    else
+      XDG_DATA_DIRS=/usr/share/mate:"$XDG_DATA_DIRS"
+    fi
+    export XDG_DATA_DIRS
+    ;;
+esac
diff --git a/X11/Xsession.d/70gconfd_path-on-session b/X11/Xsession.d/70gconfd_path-on-session

index ab8f913f45b8ff31390e470732713cf9b6c835ca..d950bd889849fd76f5d21b4bab42032d5a2192c2 100644 (file)
--- a/X11/Xsession.d/70gconfd_path-on-session
+++ b/X11/Xsession.d/70gconfd_path-on-session
@@ -3,7 +3,7 @@
  
  GCONF_PREFIX="/usr/share/gconf"
  if [ -n "$DESKTOP_SESSION" ]; then
-  export MANDATORY_PATH=${GCONF_PREFIX}/${DESKTOP_SESSION}.mandatory.path
-  export DEFAULTS_PATH=${GCONF_PREFIX}/${DESKTOP_SESSION}.default.path
+  export MANDATORY_PATH="${GCONF_PREFIX}/${DESKTOP_SESSION}.mandatory.path"
+  export DEFAULTS_PATH="${GCONF_PREFIX}/${DESKTOP_SESSION}.default.path"
  fi
  
diff --git a/X11/Xsession.d/70im-config_launch b/X11/Xsession.d/70im-config_launch

index be7be702687e34d385f1a167d2a31abced7b2f9a..a9d6cdd9c6542832fdb5ec1ca3d24f3274d30d24 100644 (file)
--- a/X11/Xsession.d/70im-config_launch
+++ b/X11/Xsession.d/70im-config_launch
@@ -11,6 +11,11 @@
  
  IMLAUNCH=/usr/bin/im-launch
  
+if [ "$IM_CONFIG_PHASE" = 1 ]; then
+    IM_CONFIG_CHECK_ENV=1
+    export IM_CONFIG_CHECK_ENV
+fi
+
  # If already tweaked, keep hands off :-)
  # If im-config is removed but not purged, keep hands off :-)
  if [ -z "$XMODIFIERS" ] && \
diff --git a/X11/Xsession.d/90qt-a11y b/X11/Xsession.d/90qt-a11y

index 29923211b7f3dcb77d24f01eb5f9328d8e7b7dfb..bd3d1fb6b75e9117e8f1ace1e275808592900115 100644 (file)
--- a/X11/Xsession.d/90qt-a11y
+++ b/X11/Xsession.d/90qt-a11y
@@ -8,5 +8,5 @@ QT_ACCESSIBILITY=1
  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
+        dbus-update-activation-environment --verbose --systemd QT_ACCESSIBILITY
  fi
diff --git a/X11/app-defaults/Editres b/X11/app-defaults/Editres

index 539194974e312ba63a7775fc72210c50789ef91e..8907299a536055df585cb35fd0efa9310ac3391e 100644 (file)
--- a/X11/app-defaults/Editres
+++ b/X11/app-defaults/Editres
@@ -128,7 +128,7 @@ Editres.Geometry:                   500x568
  
  ! For the Filename popup dialog.
  
-*fileDialog*value:             
+*fileDialog*value:
  *fileDialog*allowShellResize:          True
  *fileDialog*Text.baseTranslations:     #override \n\
         <Key>Return:            PopdownFileDialog(okay)
@@ -185,7 +185,7 @@ Editres.Geometry:                   500x568
  
  *namesAndClasses*Toggle.baseTranslations: #override \n\
         <Btn1Down>,<Btn1Up>:   set() notify()
-    
+
  
  *commandBox.skipAdjust:                                True
  
@@ -208,7 +208,7 @@ Editres.Geometry:                   500x568
         :<Key>N:                Relabel(name) \n\
         :<Key>C:                Relabel(class) \n\
         :<Key>I:                Relabel(id) \n\
-       :<Key>W:                Relabel(window) 
+       :<Key>W:                Relabel(window)
  
  *Tree.Toggle.baseTranslations: #override \n\
         :<Key>space:            Select(nothing) \n\
diff --git a/X11/app-defaults/XScreenSaver-gl b/X11/app-defaults/XScreenSaver-gl

index 8e9f905dcd6c0d5bb9047a512209e763a32ef1bc..e75c4ea607b9b1836873121fccb4d4cb51e4504d 100644 (file)
--- a/X11/app-defaults/XScreenSaver-gl
+++ b/X11/app-defaults/XScreenSaver-gl
@@ -4,8 +4,8 @@
  !            a screen saver and locker for the X window system
  !                            by Jamie Zawinski
  !
-!                              version 5.36
-!                              10-Oct-2016
+!                              version 5.42
+!                              28-Dec-2018
  !
  ! See "man xscreensaver" for more info.  The latest version is always
  ! available at https://www.jwz.org/xscreensaver/
@@ -63,7 +63,7 @@
  *textLiteral:          XScreenSaver
  *textFile:             
  *textProgram:          fortune
-*textURL:              http://feeds.feedburner.com/ubuntu-news
+*textURL:              https://feeds.feedburner.com/ubuntu-news
  
  *overlayTextForeground:        #FFFF00
  *overlayTextBackground:        #000000
@@ -390,7 +390,17 @@ GetViewPortIsFullOfLies: False
    GL:                          hydrostat -root                             \n\
    GL:                          raverhoop -root                             \n\
    GL:                          splodesic -root                             \n\
-  GL:                          unicrud -root                               \n
+  GL:                          unicrud -root                               \n\
+  GL:                          esper -root                                 \n\
+  GL:                          vigilance -root                             \n\
+  GL:                          crumbler -root                              \n\
+                               filmleader -root                            \n\
+                               glitchpeg -root                             \n\
+  GL:                          handsy -root                                \n\
+  GL:                          maze3d -root                                \n\
+  GL:                          peepers -root                               \n\
+  GL:                          razzledazzle -root                          \n\
+                               vfeedback -root                             \n
  
  
  
@@ -411,15 +421,16 @@ XScreenSaver.bourneShell:         /bin/sh
  ! Resources for the password and splash-screen dialog boxes of
  ! the "xscreensaver" daemon.
  !
-*Dialog.headingFont:           *-helvetica-bold-r-*-*-*-180-*-*-*-iso8859-1
-*Dialog.bodyFont:              *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
-*Dialog.labelFont:             *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
-*Dialog.unameFont:             *-helvetica-bold-r-*-*-*-120-*-*-*-iso8859-1
-*Dialog.buttonFont:            *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
-*Dialog.dateFont:              *-helvetica-medium-r-*-*-*-80-*-*-*-iso8859-1
+*Dialog.headingFont:   -*-helvetica-bold-r-*-*-*-180-*-*-*-*-iso8859-1
+*Dialog.bodyFont:      -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-1
+*Dialog.labelFont:     -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-1
+*Dialog.unameFont:     -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1
+*Dialog.buttonFont:    -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-1
+*Dialog.dateFont:      -*-helvetica-medium-r-*-*-*-80-*-*-*-*-iso8859-1
+
  ! Helvetica asterisks look terrible.
-!*passwd.passwdFont:           *-helvetica-medium-r-*-*-*-140-*-*-*-iso8859-1
-*passwd.passwdFont:            *-courier-medium-r-*-*-*-140-*-*-*-iso8859-1
+*passwd.passwdFont:    -*-courier-medium-r-*-*-*-140-*-*-*-iso8859-1
+
  
  *Dialog.foreground:            #000000
  *Dialog.background:            #E6E6E6
@@ -450,7 +461,7 @@ XScreenSaver.bourneShell:           /bin/sh
  *passwd.uname:                  True
  
  *splash.heading.label:         XScreenSaver %s
-*splash.body.label:            Copyright \251 1991-2016 by
+*splash.body.label:            Copyright \251 1991-2018 by
  *splash.body2.label:           Jamie Zawinski <jwz@jwz.org>
  *splash.demo.label:            Settings
  *splash.help.label:            Help
@@ -488,6 +499,7 @@ XScreenSaver.bourneShell:           /bin/sh
  *hacks.energystream.name:   EnergyStream
  *hacks.euler2d.name:        Euler2D
  *hacks.fadeplot.name:       FadePlot
+*hacks.filmleader.name:     FilmLeader
  *hacks.flipflop.name:       FlipFlop
  *hacks.flipscreen3d.name:   FlipScreen3D
  *hacks.fliptext.name:       FlipText
@@ -499,6 +511,7 @@ XScreenSaver.bourneShell:           /bin/sh
  *hacks.gflux.name:          GFlux
  *hacks.gleidescope.name:    Gleidescope
  *hacks.glforestfire.name:   GLForestFire
+*hacks.glitchpeg.name:      GlitchPEG
  *hacks.hyperball.name:      HyperBall
  *hacks.hypercube.name:      HyperCube
  *hacks.ifs.name:            IFS
@@ -508,6 +521,7 @@ XScreenSaver.bourneShell:           /bin/sh
  *hacks.lcdscrub.name:       LCDscrub
  *hacks.lmorph.name:         LMorph
  *hacks.m6502.name:          m6502
+*hacks.maze3d.name:         Maze3D
  *hacks.memscroller.name:    MemScroller
  *hacks.metaballs.name:      MetaBalls
  *hacks.mirrorblob.name:     MirrorBlob
@@ -519,6 +533,7 @@ XScreenSaver.bourneShell:           /bin/sh
  *hacks.projectiveplane.name:ProjectivePlane
  *hacks.quasicrystal.name:   QuasiCrystal
  *hacks.raverhoop.name:      RaverHoop
+*hacks.razzledazzle.name:   RazzleDazzle
  *hacks.rd-bomb.name:        RDbomb
  *hacks.rdbomb.name:         RDbomb
  *hacks.romanboy.name:       RomanBoy
@@ -539,6 +554,7 @@ XScreenSaver.bourneShell:           /bin/sh
  *hacks.topblock.name:       TopBlock
  *hacks.tronbit.name:        TronBit
  *hacks.unknownpleasures.name:UnknownPleasures
+*hacks.vfeedback.name:      VFeedback
  *hacks.vidwhacker.name:     VidWhacker
  *hacks.webcollage.name:     WebCollage
  *hacks.whirlwindwarp.name:  WhirlWindWarp
diff --git a/X11/app-defaults/XScreenSaver-nogl b/X11/app-defaults/XScreenSaver-nogl

index 97f8a68f7b9fb5ca756745c0f07105142e663dae..73ab2ae5ee8d09741d93b4f38a4b962903574166 100644 (file)
--- a/X11/app-defaults/XScreenSaver-nogl
+++ b/X11/app-defaults/XScreenSaver-nogl
@@ -4,8 +4,8 @@
  !            a screen saver and locker for the X window system
  !                            by Jamie Zawinski
  !
-!                              version 5.36
-!                              10-Oct-2016
+!                              version 5.42
+!                              28-Dec-2018
  !
  ! See "man xscreensaver" for more info.  The latest version is always
  ! available at https://www.jwz.org/xscreensaver/
@@ -63,7 +63,7 @@
  *textLiteral:          XScreenSaver
  *textFile:             
  *textProgram:          fortune
-*textURL:              http://feeds.feedburner.com/ubuntu-news
+*textURL:              https://feeds.feedburner.com/ubuntu-news
  
  *overlayTextForeground:        #FFFF00
  *overlayTextBackground:        #000000
@@ -390,7 +390,17 @@ GetViewPortIsFullOfLies: False
  - GL:                          hydrostat -root                             \n\
  - GL:                          raverhoop -root                             \n\
  - GL:                          splodesic -root                             \n\
-- GL:                          unicrud -root                               \n
+- GL:                          unicrud -root                               \n\
+- GL:                          esper -root                                 \n\
+- GL:                          vigilance -root                             \n\
+- GL:                          crumbler -root                              \n\
+                               filmleader -root                            \n\
+                               glitchpeg -root                             \n\
+- GL:                          handsy -root                                \n\
+- GL:                          maze3d -root                                \n\
+- GL:                          peepers -root                               \n\
+- GL:                          razzledazzle -root                          \n\
+                               vfeedback -root                             \n
  
  
  
@@ -411,15 +421,16 @@ XScreenSaver.bourneShell:         /bin/sh
  ! Resources for the password and splash-screen dialog boxes of
  ! the "xscreensaver" daemon.
  !
-*Dialog.headingFont:           *-helvetica-bold-r-*-*-*-180-*-*-*-iso8859-1
-*Dialog.bodyFont:              *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
-*Dialog.labelFont:             *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
-*Dialog.unameFont:             *-helvetica-bold-r-*-*-*-120-*-*-*-iso8859-1
-*Dialog.buttonFont:            *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1
-*Dialog.dateFont:              *-helvetica-medium-r-*-*-*-80-*-*-*-iso8859-1
+*Dialog.headingFont:   -*-helvetica-bold-r-*-*-*-180-*-*-*-*-iso8859-1
+*Dialog.bodyFont:      -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-1
+*Dialog.labelFont:     -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-1
+*Dialog.unameFont:     -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1
+*Dialog.buttonFont:    -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-1
+*Dialog.dateFont:      -*-helvetica-medium-r-*-*-*-80-*-*-*-*-iso8859-1
+
  ! Helvetica asterisks look terrible.
-!*passwd.passwdFont:           *-helvetica-medium-r-*-*-*-140-*-*-*-iso8859-1
-*passwd.passwdFont:            *-courier-medium-r-*-*-*-140-*-*-*-iso8859-1
+*passwd.passwdFont:    -*-courier-medium-r-*-*-*-140-*-*-*-iso8859-1
+
  
  *Dialog.foreground:            #000000
  *Dialog.background:            #E6E6E6
@@ -450,7 +461,7 @@ XScreenSaver.bourneShell:           /bin/sh
  *passwd.uname:                  True
  
  *splash.heading.label:         XScreenSaver %s
-*splash.body.label:            Copyright \251 1991-2016 by
+*splash.body.label:            Copyright \251 1991-2018 by
  *splash.body2.label:           Jamie Zawinski <jwz@jwz.org>
  *splash.demo.label:            Settings
  *splash.help.label:            Help
@@ -488,6 +499,7 @@ XScreenSaver.bourneShell:           /bin/sh
  *hacks.energystream.name:   EnergyStream
  *hacks.euler2d.name:        Euler2D
  *hacks.fadeplot.name:       FadePlot
+*hacks.filmleader.name:     FilmLeader
  *hacks.flipflop.name:       FlipFlop
  *hacks.flipscreen3d.name:   FlipScreen3D
  *hacks.fliptext.name:       FlipText
@@ -499,6 +511,7 @@ XScreenSaver.bourneShell:           /bin/sh
  *hacks.gflux.name:          GFlux
  *hacks.gleidescope.name:    Gleidescope
  *hacks.glforestfire.name:   GLForestFire
+*hacks.glitchpeg.name:      GlitchPEG
  *hacks.hyperball.name:      HyperBall
  *hacks.hypercube.name:      HyperCube
  *hacks.ifs.name:            IFS
@@ -508,6 +521,7 @@ XScreenSaver.bourneShell:           /bin/sh
  *hacks.lcdscrub.name:       LCDscrub
  *hacks.lmorph.name:         LMorph
  *hacks.m6502.name:          m6502
+*hacks.maze3d.name:         Maze3D
  *hacks.memscroller.name:    MemScroller
  *hacks.metaballs.name:      MetaBalls
  *hacks.mirrorblob.name:     MirrorBlob
@@ -519,6 +533,7 @@ XScreenSaver.bourneShell:           /bin/sh
  *hacks.projectiveplane.name:ProjectivePlane
  *hacks.quasicrystal.name:   QuasiCrystal
  *hacks.raverhoop.name:      RaverHoop
+*hacks.razzledazzle.name:   RazzleDazzle
  *hacks.rd-bomb.name:        RDbomb
  *hacks.rdbomb.name:         RDbomb
  *hacks.romanboy.name:       RomanBoy
@@ -539,6 +554,7 @@ XScreenSaver.bourneShell:           /bin/sh
  *hacks.topblock.name:       TopBlock
  *hacks.tronbit.name:        TronBit
  *hacks.unknownpleasures.name:UnknownPleasures
+*hacks.vfeedback.name:      VFeedback
  *hacks.vidwhacker.name:     VidWhacker
  *hacks.webcollage.name:     WebCollage
  *hacks.whirlwindwarp.name:  WhirlWindWarp
diff --git a/X11/fonts/Type1/gsfonts-x11.alias b/X11/fonts/Type1/gsfonts-x11.alias

index 055877ee26b95ced553a34598acdb56d59331599..6b7f74158a63225d13b5aca3432d28892c74d823 100644 (file)
--- a/X11/fonts/Type1/gsfonts-x11.alias
+++ b/X11/fonts/Type1/gsfonts-x11.alias
@@ -227,18 +227,3 @@
  "-itc-itc zapf dingbats-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific" -urw-dingbats-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific
  "-adobe-itc zapf dingbats-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific" -urw-dingbats-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific
  -urw-dingbats-regular-r-normal--0-0-0-0-p-0-adobe-fontspecific -urw-dingbats-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific
-!
-! For Sketch (normal = medium, regular = medium):
-!
--bitstream-charter-normal-r-normal--0-0-0-0-p-0-iso8859-1 -bitstream-charter-medium-r-normal--0-0-0-0-p-0-iso8859-1
--bitstream-charter-normal-r-normal--0-0-0-0-p-0-iso8859-2 -bitstream-charter-medium-r-normal--0-0-0-0-p-0-iso8859-2
--bitstream-charter-normal-r-normal--0-0-0-0-p-0-iso8859-15 -bitstream-charter-medium-r-normal--0-0-0-0-p-0-iso8859-15
--bitstream-charter-normal-i-normal--0-0-0-0-p-0-iso8859-1 -bitstream-charter-medium-i-normal--0-0-0-0-p-0-iso8859-1
--bitstream-charter-normal-i-normal--0-0-0-0-p-0-iso8859-2 -bitstream-charter-medium-i-normal--0-0-0-0-p-0-iso8859-2
--bitstream-charter-normal-i-normal--0-0-0-0-p-0-iso8859-15 -bitstream-charter-medium-i-normal--0-0-0-0-p-0-iso8859-15
--adobe-utopia-regular-r-normal--0-0-0-0-p-0-iso8859-1 -adobe-utopia-medium-r-normal--0-0-0-0-p-0-iso8859-1
--adobe-utopia-regular-r-normal--0-0-0-0-p-0-iso8859-2 -adobe-utopia-medium-r-normal--0-0-0-0-p-0-iso8859-2
--adobe-utopia-regular-r-normal--0-0-0-0-p-0-iso8859-15 -adobe-utopia-medium-r-normal--0-0-0-0-p-0-iso8859-15
--adobe-utopia-regular-i-normal--0-0-0-0-p-0-iso8859-1 -adobe-utopia-medium-i-normal--0-0-0-0-p-0-iso8859-1
--adobe-utopia-regular-i-normal--0-0-0-0-p-0-iso8859-2 -adobe-utopia-medium-i-normal--0-0-0-0-p-0-iso8859-2
--adobe-utopia-regular-i-normal--0-0-0-0-p-0-iso8859-15 -adobe-utopia-medium-i-normal--0-0-0-0-p-0-iso8859-15
diff --git a/alternatives/aclocal b/alternatives/aclocal

index 7cfc22b08c3948c69cf295698dd2eafe164a497d..ab5fbaff8eea66ab25785ff9a82c1311b01c5c04 120000 (symlink)
--- a/alternatives/aclocal
+++ b/alternatives/aclocal
@@ -1 +1 @@
-/usr/bin/aclocal-1.15
-\ No newline at end of file
+/usr/bin/aclocal-1.16
+\ No newline at end of file
diff --git a/alternatives/aclocal.1.gz b/alternatives/aclocal.1.gz

index ca112c48c0c7e8cc70c99e79d9a5608a903db9d2..f102ed651042eabbc7a7a84a1f4b9035cddc810f 120000 (symlink)
--- a/alternatives/aclocal.1.gz
+++ b/alternatives/aclocal.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/aclocal-1.15.1.gz
-\ No newline at end of file
+/usr/share/man/man1/aclocal-1.16.1.gz
+\ No newline at end of file
diff --git a/alternatives/automake b/alternatives/automake

index f0d3cd9a39d613832579a2be8bf6b90ea6615820..a64f2984a34a56b8f7cadfe1f58f657f4345cae4 120000 (symlink)
--- a/alternatives/automake
+++ b/alternatives/automake
@@ -1 +1 @@
-/usr/bin/automake-1.15
-\ No newline at end of file
+/usr/bin/automake-1.16
+\ No newline at end of file
diff --git a/alternatives/automake.1.gz b/alternatives/automake.1.gz

index 406c4b3c4e17a27f08a2c94566560fc4e2a661e0..68ed1772eb2e67fcd51b32e93c900005f088f26d 120000 (symlink)
--- a/alternatives/automake.1.gz
+++ b/alternatives/automake.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/automake-1.15.1.gz
-\ No newline at end of file
+/usr/share/man/man1/automake-1.16.1.gz
+\ No newline at end of file
diff --git a/alternatives/ebtables b/alternatives/ebtables

new file mode 120000 (symlink)

index 0000000..a4267f8
--- /dev/null
+++ b/alternatives/ebtables
@@ -0,0 +1 @@
+/usr/sbin/ebtables-legacy
+\ No newline at end of file
diff --git a/alternatives/ebtables-restore b/alternatives/ebtables-restore

new file mode 120000 (symlink)

index 0000000..3ec0ed5
--- /dev/null
+++ b/alternatives/ebtables-restore
@@ -0,0 +1 @@
+/usr/sbin/ebtables-legacy-restore
+\ No newline at end of file
diff --git a/alternatives/ebtables-save b/alternatives/ebtables-save

new file mode 120000 (symlink)

index 0000000..fadfcf3
--- /dev/null
+++ b/alternatives/ebtables-save
@@ -0,0 +1 @@
+/usr/sbin/ebtables-legacy-save
+\ No newline at end of file
diff --git a/alternatives/ip6tables.service b/alternatives/ip6tables.service

new file mode 120000 (symlink)

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

new file mode 120000 (symlink)

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

deleted file mode 100755 (executable)

index 951d869..0000000
--- a/apm/event.d/20hdparm
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2000-2002 Massachusetts Institute of Technology
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-set -e
-
-# The APMD_DRIVES setting specifies the drives to be changed.  Set
-# this to an empty string to disable any changes.
-#APMD_DRIVES=
-
-# The spindown timeout is set to the value of APMD_SPINDOWN when the
-# computer is running on battery power.  When the computer is on AC
-# power, the spindown timeout is disabled.  The number specified here
-# is encoded in a complicated way.  See the man page for hdparm(8) for
-# details.  For small timeouts, numbers between 1 and 240 specify
-# multiples of 5 seconds.  So the default value of 18 means 18*5=90
-# seconds, or 1.5 minutes.
-APMD_SPINDOWN=18
-
-HDPARM=/sbin/hdparm
-[ -x "${HDPARM}" ] || exit 0
-
-[ -n "${APMD_DRIVES}" ] || exit 0
-
-for DRIVE in $APMD_DRIVES; do
-  [ -b "${DRIVE}" ] || exit 0
-done
-
-[ "${APMD_SPINDOWN}" -gt 0 ] || exit 0
-
-power_conserve ()
-{
-    # Set IDE hard disk spindown time to a short time.
-    for DRIVE in $APMD_DRIVES; do
-      "${HDPARM}" -q -S "${APMD_SPINDOWN}" "${DRIVE}" || true
-    done
-}
-
-power_performance ()
-{
-    # Disable IDE hard disk spindown.
-    for DRIVE in $APMD_DRIVES; do
-      "${HDPARM}" -q -S 0 "${DRIVE}" || true
-    done
-}
-
-choose_power ()
-{
-    if on_ac_power > /dev/null
-    then
-       power_performance
-    else
-       power_conserve
-    fi
-}
-
-if [ "${1}" = "start" ]; then
-    choose_power
-elif [ "${1}" = "resume" ] && [ "${2}" != "standby" ]; then
-    choose_power
-elif [ "${1},${2}" = "change,power" ]; then
-    choose_power
-elif [ "${1}" = "stop" ]; then
-    power_performance
-fi
-
-exit 0
diff --git a/apm/event.d/anacron b/apm/event.d/anacron

deleted file mode 100755 (executable)

index 5c5a693..0000000
--- a/apm/event.d/anacron
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-
-# This script makes anacron jobs start to run when the machine is
-# plugged into AC power, or woken up.  For a laptop, these are the 
-# closest parallels to turning on a desktop.
-
-# The /etc/init.d/anacron script now normally tries to avoid running
-# anacron unless on AC power, so as to avoid running down the battery.
-# (Things like the slocate updatedb cause a lot of IO.)  Rather than
-# trying to second-guess which events reflect having or not having
-# power, we just try to run anacron every time and let it abort if
-# there's no AC.  You'll see a message on the cron syslog facility 
-# (typically /var/log/cron) if it does run.
-
-case "$1,$2" in
-change,power|resume,*)
-    /usr/sbin/invoke-rc.d anacron start >/dev/null   
-    ;;
-esac
diff --git a/apparmor.d/abstractions/X b/apparmor.d/abstractions/X

index ced3c6ba94989996792cc38d144fd33c3762697f..db3521e7adf4ec3618d97506b495dbc866cdbc87 100644 (file)
--- a/apparmor.d/abstractions/X
+++ b/apparmor.d/abstractions/X
@@ -10,6 +10,7 @@
  #
  # ------------------------------------------------------------------
  
+  #include <abstractions/dri-common>
  
  
    # .ICEauthority files required for X authentication, per user
@@ -45,17 +46,12 @@
    # EGL
    /usr/lib/@{multiarch}/egl/*.so* mr,
  
-  # DRI
-  /usr/lib{,32,64}/dri/**         mr,
-  /usr/lib/@{multiarch}/dri/**    mr,
-  /usr/lib/fglrx/dri/**           mr,
-  /dev/dri/**                     rw,
-  /etc/drirc                      r,
-  owner @{HOME}/.drirc            r,
-
    # Xcompose
    owner @{HOME}/.XCompose         r,
  
    # mouse themes
    /etc/X11/cursors/               r,
    /etc/X11/cursors/**             r,
+
+  # Xwayland
+  owner /run/user/*/.mutter-Xwaylandauth.* r,
diff --git a/apparmor.d/abstractions/apache2-common b/apparmor.d/abstractions/apache2-common

index 3088c03622b8a69d09cfc3656b5dbdc4775e81a7..850dd89c838d10e4766f37984426628ad6a482d7 100644 (file)
--- a/apparmor.d/abstractions/apache2-common
+++ b/apparmor.d/abstractions/apache2-common
@@ -7,9 +7,9 @@
    # Allow unconfined processes to send us signals by default
    signal (receive) peer=unconfined,
    # Allow apache to send us signals by default
-  signal (receive) peer=/usr/sbin/apache2,
+  signal (receive) peer=apache2,
    # Allow other hats to signal by default
-  signal peer=/usr/sbin/apache2//*,
+  signal peer=apache2//*,
    # Allow us to signal ourselves
    signal peer=@{profile_name},
  
diff --git a/apparmor.d/abstractions/apparmor_api/is_enabled b/apparmor.d/abstractions/apparmor_api/is_enabled

index a69310e138d313a9234eb847e714e7653ed4eb95..a637d3cedb7cbcdf2f524c148982df6fad14a8b7 100644 (file)
--- a/apparmor.d/abstractions/apparmor_api/is_enabled
+++ b/apparmor.d/abstractions/apparmor_api/is_enabled
@@ -8,8 +8,8 @@
  
  # permissions needed for aa_is_enabled
  
-# Make sure to include at least tunables/sys and tunables/apparmorfs
-# when using this abstraction, if not tunables/global.
+# Make sure to include tunables/apparmorfs and tunables/global
+# when using this abstraction
  
  #include <abstractions/apparmor_api/find_mountpoint>
  @{sys}/module/apparmor/parameters/enabled r,
diff --git a/apparmor.d/abstractions/audio b/apparmor.d/abstractions/audio

index 960083a1df498e99dd6f244a1401a2b21d941817..f4dbaac30bc1764e363731c21e7bf56f4ead8cce 100644 (file)
--- a/apparmor.d/abstractions/audio
+++ b/apparmor.d/abstractions/audio
@@ -41,9 +41,14 @@
  /usr/share/sounds/** r,
  
  owner @{HOME}/.esd_auth r,
+/etc/asound.conf r,
  owner @{HOME}/.asoundrc r,
  /etc/esound/esd.conf r,
  
+# libao
+/etc/libao.conf r,
+owner @{HOME}/.libao r,
+
  # libcanberra
  owner @{HOME}/.cache/event-sound-cache.* rwk,
  
@@ -68,6 +73,7 @@ owner /tmp/pulse-*/* rw,
  /etc/sound/** r,
  
  # openal
+/etc/alsa/conf.d/{,*} r,
  /etc/openal/alsoft.conf r,
  owner @{HOME}/.alsoftrc r,
  /usr/{,local/}share/openal/hrtf/{,**} r,
diff --git a/apparmor.d/abstractions/base b/apparmor.d/abstractions/base

index ee19e1b97069ae7c828454e6af3040f3f89e8b48..1dc77a30d6d0a88c451307e97221e240e4cd5dce 100644 (file)
--- a/apparmor.d/abstractions/base
+++ b/apparmor.d/abstractions/base
@@ -23,6 +23,10 @@
    /dev/log                       w,
    /dev/random                    r,
    /dev/urandom                   r,
+  # Allow access to the uuidd daemon (this daemon is a thin wrapper around
+  # time and getrandom()/{,u}random and, when available, runs under an
+  # unprivilged, dedicated user).
+  /run/uuidd/request             r,
    /etc/locale/**                 r,
    /etc/locale.alias              r,
    /etc/localtime                 r,
@@ -65,13 +69,11 @@
  
    # we might as well allow everything to use common libraries
    /{usr/,}lib{,32,64}/**                r,
-  /{usr/,}lib{,32,64}/lib*.so*          mr,
-  /{usr/,}lib{,32,64}/**/lib*.so*       mr,
+  /{usr/,}lib{,32,64}/**.so*       mr,
    /{usr/,}lib/@{multiarch}/**            r,
-  /{usr/,}lib/@{multiarch}/lib*.so*      mr,
-  /{usr/,}lib/@{multiarch}/**/lib*.so*   mr,
-  /{usr/,}lib/tls/i686/{cmov,nosegneg}/lib*.so*    mr,
-  /{usr/,}lib/i386-linux-gnu/tls/i686/{cmov,nosegneg}/lib*.so*    mr,
+  /{usr/,}lib/@{multiarch}/**.so*   mr,
+  /{usr/,}lib/tls/i686/{cmov,nosegneg}/*.so*    mr,
+  /{usr/,}lib/i386-linux-gnu/tls/i686/{cmov,nosegneg}/*.so*    mr,
  
    # /dev/null is pretty harmless and frequently used
    /dev/null                      rw,
@@ -91,8 +93,8 @@
    @{PROC}/meminfo                r,
    @{PROC}/stat                   r,
    @{PROC}/cpuinfo                r,
-  /sys/devices/system/cpu/       r,
-  /sys/devices/system/cpu/online r,
+  @{sys}/devices/system/cpu/       r,
+  @{sys}/devices/system/cpu/online r,
  
    # glibc's *printf protections read the maps file
    @{PROC}/@{pid}/{maps,auxv,status} r,
@@ -158,7 +160,9 @@
    # prevents access to the files from processes running under a different uid.
  
    # encrypted ~/.Private and old-style encrypted $HOME
+  owner @{HOME}/.Private/ r,
    owner @{HOME}/.Private/** mrixwlk,
    # new-style encrypted $HOME
+  owner @{HOMEDIRS}/.ecryptfs/*/.Private/ r,
    owner @{HOMEDIRS}/.ecryptfs/*/.Private/** mrixwlk,
  
diff --git a/apparmor.d/abstractions/dovecot-common b/apparmor.d/abstractions/dovecot-common

index 327cc567d7b4b38b7afea0bc5f852a208a1487e3..e1681d9a0ed892e1d653e675631cc7ed3564a6ce 100644 (file)
--- a/apparmor.d/abstractions/dovecot-common
+++ b/apparmor.d/abstractions/dovecot-common
@@ -14,6 +14,6 @@
    deny capability block_suspend,
  
    # dovecot's master can send us signals
-  signal receive peer=/usr/sbin/dovecot,
+  signal receive peer=dovecot,
  
    /{var/,}run/dovecot/config rw,
diff --git a/apparmor.d/abstractions/dri-common b/apparmor.d/abstractions/dri-common

new file mode 100644 (file)

index 0000000..b5e0a5c
--- /dev/null
+++ b/apparmor.d/abstractions/dri-common
@@ -0,0 +1,14 @@
+# vim:syntax=apparmor
+
+# This file contains common DRI-specific rules useful for GUI applications
+# (needed by libdrm and similar).
+
+  /usr/lib{,32,64}/dri/**         mr,
+  /usr/lib/@{multiarch}/dri/**    mr,
+  /usr/lib/fglrx/dri/**           mr,
+  /dev/dri/                       r,
+  /dev/dri/**                     rw,
+  /etc/drirc                      r,
+  /usr/share/drirc.d/{,*.conf}    r,
+  owner @{HOME}/.drirc            r,
+
diff --git a/apparmor.d/abstractions/dri-enumerate b/apparmor.d/abstractions/dri-enumerate

new file mode 100644 (file)

index 0000000..e101be5
--- /dev/null
+++ b/apparmor.d/abstractions/dri-enumerate
@@ -0,0 +1,8 @@
+# vim:syntax=apparmor
+
+# This file contains common DRI-specific rules useful for GUI applications that
+# needs to enumerate graphic devices (as with drmParsePciDeviceInfo() from
+# libdrm).
+
+  @{sys}/devices/pci[0-9]*/**/{device,subsystem_device,subsystem_vendor,uevent,vendor} r,
+
diff --git a/apparmor.d/abstractions/fonts b/apparmor.d/abstractions/fonts

index 45cdf9af621e83249a456186b16b78c99585155c..222aa5a611754c052c408fdfe706b071fdb47064 100644 (file)
--- a/apparmor.d/abstractions/fonts
+++ b/apparmor.d/abstractions/fonts
@@ -18,7 +18,9 @@
    /usr/share/fonts/**                   r,
  
    /etc/fonts/**                         r,
-  /usr/share/fontconfig/conf.avail/**   r,
+  # Debian, openSUSE paths are different
+  /usr/share/{fontconfig,fonts-config,*-fonts}/conf.avail/{,**} r,
+  /usr/share/ghostscript/fonts/{,**}    r,
  
    /opt/kde3/share/fonts/**              r,
  
@@ -42,7 +44,7 @@
    owner @{HOME}/.local/share/fonts/     r,
    owner @{HOME}/.local/share/fonts/**   r,
    owner @{HOME}/.fonts.cache-2          mr,
-  owner @{HOME}/.{,cache/}fontconfig/   r,
+  owner @{HOME}/.{,cache/}fontconfig/   rw,
    owner @{HOME}/.{,cache/}fontconfig/** mrl,
    owner @{HOME}/.fonts.conf.d/          r,
    owner @{HOME}/.fonts.conf.d/**        r,
diff --git a/apparmor.d/abstractions/freedesktop.org b/apparmor.d/abstractions/freedesktop.org

index cc0c343c37dac46e359ea04a50361dae26a7bba3..4ec1745970d8bb17b6ca19e874d35105cf24b89b 100644 (file)
--- a/apparmor.d/abstractions/freedesktop.org
+++ b/apparmor.d/abstractions/freedesktop.org
@@ -10,29 +10,20 @@
  # ------------------------------------------------------------------
  
    # system configuration
-  /{usr,usr/local,var/lib/flatpak/exports}/share/applications/{*/,}               r,
-  /{usr,usr/local,var/lib/flatpak/exports}/share/applications/{*/,}defaults.list  r,
-  /{usr,usr/local,var/lib/flatpak/exports}/share/applications/{*/,}mimeinfo.cache r,
-  /var/lib/snapd/desktop/applications/mimeinfo.cache r,
-  /{usr,usr/local,var/lib/flatpak/exports}/share/applications/{*/,}*.desktop      r,
-  /var/lib/snapd/desktop/applications/{,*.desktop} r,
-  /usr/share/icons/               r,
-  /usr/share/icons/**             r,
-  /usr/share/pixmaps/             r,
-  /usr/share/pixmaps/**           r,
-  /usr/local/share/icons/               r,
-  /usr/local/share/icons/**             r,
-  /usr/local/share/pixmaps/             r,
-  /usr/local/share/pixmaps/**           r,
-  /var/lib/flatpak/exports/share/icons/   r,
-  /var/lib/flatpak/exports/share/icons/** r,
+  @{system_share_dirs}/applications/{**,} r,
+  @{system_share_dirs}/icons/{**,}        r,
+  @{system_share_dirs}/pixmaps/{**,}      r,
  
    # communitheme snap
    /snap/communitheme/*/share/icons/   r,
    /snap/communitheme/*/share/icons/** r,
  
+  # mimeinfo and desktop files for snaps
+  /var/lib/snapd/desktop/applications/mimeinfo.cache r,
+  /var/lib/snapd/desktop/applications/{,*.desktop} r,
+
    # this should probably go elsewhere
-  /{usr,var/lib/flatpak/exports}/share/mime/** r,
+  @{system_share_dirs}/mime/** r,
  
    # per-user configurations
    owner @{HOME}/.icons/                 r,
@@ -40,12 +31,6 @@
    owner @{HOME}/.local/share/recently-used.xbel* rw,
    owner @{HOME}/.config/user-dirs.dirs  r,
    owner @{HOME}/.config/mimeapps.list   r,
-  owner @{HOME}/.local/share/{,flatpak/exports/share/}applications/               r,
-  owner @{HOME}/.local/share/{,flatpak/exports/share/}applications/*.desktop      r,
-  owner @{HOME}/.local/share/{,flatpak/exports/share/}applications/defaults.list  r,
-  owner @{HOME}/.local/share/{,flatpak/exports/share/}applications/mimeapps.list  r,
-  owner @{HOME}/.local/share/{,flatpak/exports/share/}applications/mimeinfo.cache r,
-  owner @{HOME}/.local/share/{,flatpak/exports/share/}icons/     r,
-  owner @{HOME}/.local/share/{,flatpak/exports/share/}icons/**   r,
-  owner @{HOME}/.local/share/{,flatpak/exports/share/}mime/      r,
-  owner @{HOME}/.local/share/{,flatpak/exports/share/}mime/**    r,
+  owner @{user_share_dirs}/applications/{**,} r,
+  owner @{user_share_dirs}/icons/{**,}        r,
+  owner @{user_share_dirs}/mime/{**,}         r,
diff --git a/apparmor.d/abstractions/gnome b/apparmor.d/abstractions/gnome

index 82d9ec4534540334a0a99ba07cd4a593d23ce545..a0459c308370c44f3b8cb741d237ba0f4cdb07e3 100644 (file)
--- a/apparmor.d/abstractions/gnome
+++ b/apparmor.d/abstractions/gnome
@@ -46,6 +46,7 @@
    /usr/lib/@{multiarch}/gdk-pixbuf-*/** mr,
  
    # per-user gtk configuration
+  owner @{HOME}/.config/gtk-3.0/        w,
    owner @{HOME}/.config/gtk-3.0/*       r,
    owner @{HOME}/.gnome/Gnome            r,
    owner @{HOME}/.gtk                    r,
@@ -54,8 +55,11 @@
    owner @{HOME}/.gtk-bookmarks          r,
    owner @{HOME}/.themes/                r,
    owner @{HOME}/.themes/**              r,
+  owner @{user_share_dirs}/themes/      r,
+  owner @{user_share_dirs}/themes/**    r,
  
    # for gtk file dialog
+  owner @{HOME}/.config/gtk-2.0/                    w,
    owner @{HOME}/.config/gtk-2.0/**                  r,
    owner @{HOME}/.config/gtk-2.0/gtkfilechooser.ini* rw,
  
@@ -66,6 +70,9 @@
    # per-user font business
    owner @{HOME}/.fonts.cache-*    rwl,
  
+  # GtkComposeTable
+  owner @{HOME}/.cache/gtk-3.0/** r,
+
    # icon caches
    /var/cache/**/icon-theme.cache  r,
    /usr/share/**/icon-theme.cache  r,
@@ -95,7 +102,7 @@
  
    # mime-types
    /etc/gnome/defaults.list r,
-  /etc/xdg/*-mimeapps.list r,
+  /etc/xdg/{,*-}mimeapps.list r,
    /usr/share/gnome/applications/ r,
    /usr/share/gnome/applications/mimeinfo.cache r,
  
diff --git a/apparmor.d/abstractions/ibus b/apparmor.d/abstractions/ibus

index 0ab02fea14d87d2a4a2ca6ad95e52fa9cf8712cf..a4431b99a038dcec11c359cf2176edcbc11c2098 100644 (file)
--- a/apparmor.d/abstractions/ibus
+++ b/apparmor.d/abstractions/ibus
@@ -14,6 +14,16 @@
    owner @{HOME}/.config/ibus/bus/ rw,
    owner @{HOME}/.config/ibus/bus/* rw,
  
+  # abstract path in ibus < 1.5.22 uses /tmp
    unix (connect, receive, send)
         type=stream
         peer=(addr="@/tmp/ibus/dbus-*"),
+
+  # abstract path in ibus >= 1.5.22 uses $XDG_CACHE_HOME (ie, @{HOME}/.cache)
+  # This should use this, but due to LP: #1856738 we cannot
+  #unix (connect, receive, send)
+  #    type=stream
+  #    peer=(addr="@@{HOME}/.cache/ibus/dbus-*"),
+  unix (connect, receive, send)
+       type=stream
+       peer=(addr="@/home/*/.cache/ibus/dbus-*"),
diff --git a/apparmor.d/abstractions/kde b/apparmor.d/abstractions/kde

index 49efa6a74c120293922c7da3cea853c0840cc590..cad5c7db082cff3432b2cc05f49a72e9d31e932f 100644 (file)
--- a/apparmor.d/abstractions/kde
+++ b/apparmor.d/abstractions/kde
@@ -15,6 +15,7 @@
  #include <abstractions/freedesktop.org>
  #include <abstractions/xdg-desktop>
  #include <abstractions/user-tmp>
+#include <abstractions/qt5>
  
  /etc/qt3/kstylerc r,
  /etc/qt3/qt_plugins_3.3rc r,
@@ -22,7 +23,10 @@
  /etc/kderc r,
  /etc/kde3/* r,
  /etc/kde4rc r,
+/etc/xdg/kdeglobals r,
  /etc/xdg/Trolltech.conf r,
+/usr/share/knotifications5/*.notifyrc r, # KNotification::sendEvent()
+/usr/share/kubuntu-default-settings/kf5-settings/* r,
  
  owner @{HOME}/.DCOPserver_* r,
  owner @{HOME}/.ICEauthority r,
@@ -30,10 +34,15 @@ owner @{HOME}/.fonts.* lrw,
  owner @{HOME}/.kde{,4}/share/config/kdeglobals rw,
  owner @{HOME}/.kde{,4}/share/config/*.lock rwl,
  owner @{HOME}/.qt/** rw,
+owner @{HOME}/.cache/ksycoca5_??_* r, # KDE System Configuration Cache
  owner @{HOME}/.config/Trolltech.conf rwk,
+owner @{HOME}/.config/baloofilerc r, # indexing options (excludes, etc), used by KFileWidget
+owner @{HOME}/.config/dolphinrc r, # settings used by KFileWidget
+owner @{HOME}/.config/kde.org/libphonon.conf r, # for KNotifications::sendEvent()
+owner @{HOME}/.config/kdeglobals r, # global settings, used by Breeze style, etc.
+owner @{HOME}/.config/klanguageoverridesrc r, # per-application languages, for KDEPrivate::initializeLanguages() from libKF5XmlGui.so
+owner @{HOME}/.config/trashrc r, # Used by KFileWidget
  
-/usr/share/icons/ r,
-/usr/share/icons/** r,
  /usr/share/X11/XKeysymDB r,
  
  # kde3
diff --git a/apparmor.d/abstractions/kde-globals-write b/apparmor.d/abstractions/kde-globals-write

new file mode 100644 (file)

index 0000000..5f878e8
--- /dev/null
+++ b/apparmor.d/abstractions/kde-globals-write
@@ -0,0 +1,10 @@
+# vim:syntax=apparmor
+# Rules for changing KDE settings (for KFileDialog and other).
+
+  # User files
+ 
+  owner @{HOME}/.config/#[0-9]* rw,
+  owner @{HOME}/.config/kdeglobals rw,
+  owner @{HOME}/.config/kdeglobals.?????? rwl -> @{HOME}/.config/#[0-9]*,
+  owner @{HOME}/.config/kdeglobals.lock rwk,
+
diff --git a/apparmor.d/abstractions/kde-icon-cache-write b/apparmor.d/abstractions/kde-icon-cache-write

new file mode 100644 (file)

index 0000000..d37fb3b
--- /dev/null
+++ b/apparmor.d/abstractions/kde-icon-cache-write
@@ -0,0 +1,7 @@
+# vim:syntax=apparmor
+# Rules for writing KDE icon cache
+
+  # User files
+
+  owner @{HOME}/.cache/icon-cache.kcache rw, # for KIconLoader
+
diff --git a/apparmor.d/abstractions/kde-language-write b/apparmor.d/abstractions/kde-language-write

new file mode 100644 (file)

index 0000000..8e95399
--- /dev/null
+++ b/apparmor.d/abstractions/kde-language-write
@@ -0,0 +1,12 @@
+# vim:syntax=apparmor
+# Rules for changing per-application language settings on KDE. Some KDE
+# applications have "Help -> Switch Application Language..." option, that needs
+# write access to language settings file.
+
+  # User files
+
+  owner @{HOME}/.config/#[0-9]* rw,
+  owner @{HOME}/.config/klanguageoverridesrc rw,
+  owner @{HOME}/.config/klanguageoverridesrc.?????? rwl -> @{HOME}/.config/#[0-9]*,
+  owner @{HOME}/.config/klanguageoverridesrc.lock rwk,
+
diff --git a/apparmor.d/abstractions/kerberosclient b/apparmor.d/abstractions/kerberosclient

index eab762a2f09040eb8baadfedb030c6f96310d187..5b79e3d6bcbcf08579c7be4c601f3aa28c0e90da 100644 (file)
--- a/apparmor.d/abstractions/kerberosclient
+++ b/apparmor.d/abstractions/kerberosclient
@@ -22,6 +22,8 @@
  
    /etc/krb5.keytab            rk,
    /etc/krb5.conf              r,
+  /etc/krb5.conf.d/           r,
+  /etc/krb5.conf.d/*          r,
  
    # config files found via strings on libs
    /etc/krb.conf               r,
diff --git a/apparmor.d/abstractions/launchpad-integration b/apparmor.d/abstractions/launchpad-integration

deleted file mode 100644 (file)

index 1f833ce..0000000
--- a/apparmor.d/abstractions/launchpad-integration
+++ /dev/null
@@ -1,28 +0,0 @@
-# vim:syntax=apparmor
-# launchpad-integration
-
-  # Launchpad integration should run in a sanitizing profile
-  /usr/bin/launchpad-integration Cxr -> launchpad_integration,
-  profile launchpad_integration {
-    #include <abstractions/base>
-    #include <abstractions/nameservice>
-    #include <abstractions/ubuntu-browsers>
-
-    # Required for debuggers
-    capability sys_ptrace,
-
-    # Run confined with security execution. sudo scrubs the environment, so we
-    # don't have to
-    /usr/bin/sudo Ux,
-
-    # Give it wide permissions since it and apport need to do a lot
-    /** rwlk,
-    /{,usr/}{,s}bin/* Pixr,
-    /{,usr/}lib*/{,**/}*.so{,.*} m,
-    /usr/share/apport/* Pixr,
-
-    # Dangerous files
-    audit deny owner /**/*.py* r,       # python imports
-    audit deny owner /**/* m,           # compiled libraries
-  }
-
diff --git a/apparmor.d/abstractions/ldapclient b/apparmor.d/abstractions/ldapclient

index e3922ca6b08d9797c60d44dedfdbdd285fd373d0..0c527282f7a8320b9540e8d3fe5b29eeba8c0fb9 100644 (file)
--- a/apparmor.d/abstractions/ldapclient
+++ b/apparmor.d/abstractions/ldapclient
@@ -18,4 +18,7 @@
    /etc/sasl2/*              r,
    /usr/lib{,32,64}/sasl2/*  r,
  
+  # local LDAP name service daemon
+  /{,var/}run/nslcd/socket  rw,
+
    #include <abstractions/ssl_certs>
diff --git a/apparmor.d/abstractions/lightdm b/apparmor.d/abstractions/lightdm

index 4be3d4a31464538319acca9bbfa01c968d38f3f7..f4b678114b9714521dd472e37a2f2867fab58214 100644 (file)
--- a/apparmor.d/abstractions/lightdm
+++ b/apparmor.d/abstractions/lightdm
@@ -23,7 +23,7 @@
  
    / r,
    /bin/ rmix,
-  /bin/fusermount Px,
+  /{,usr/}bin/fusermount Px,
    /bin/** rmix,
    /cdrom/ rmix,
    /cdrom/** rmix,
diff --git a/apparmor.d/abstractions/mdns b/apparmor.d/abstractions/mdns

index e05ef3a451496e3312744ea40158dc6752e4816d..14c31b8c5f917b7c1f3748beef44ad19a883d255 100644 (file)
--- a/apparmor.d/abstractions/mdns
+++ b/apparmor.d/abstractions/mdns
@@ -9,5 +9,6 @@
  # ------------------------------------------------------------------
  
    # mdnsd
+  /etc/mdns.allow r,
    /etc/nss_mdns.conf r,
    /{,var/}run/mdnsd w,
diff --git a/apparmor.d/abstractions/mesa b/apparmor.d/abstractions/mesa

new file mode 100644 (file)

index 0000000..be699c7
--- /dev/null
+++ b/apparmor.d/abstractions/mesa
@@ -0,0 +1,17 @@
+# vim:syntax=apparmor
+# Rules for Mesa implementation of the OpenGL API
+
+  # System files
+  /dev/dri/ r, # libGLX_mesa.so calls drmGetDevice2()
+
+  # Needed to check if the kernel supports the i915 perf interface
+  # (src/intel/perf/gen_perf.c, load_oa_metrics())
+  @{PROC}/sys/dev/i915/perf_stream_paranoid r,
+
+  # User files
+  owner @{HOME}/.cache/ w, # if user clears all caches
+  owner @{HOME}/.cache/mesa_shader_cache/ w,
+  owner @{HOME}/.cache/mesa_shader_cache/index rw,
+  owner @{HOME}/.cache/mesa_shader_cache/??/ w,
+  owner @{HOME}/.cache/mesa_shader_cache/??/* rwk,
+
diff --git a/apparmor.d/abstractions/nameservice b/apparmor.d/abstractions/nameservice

index 6e678fb046601433c185a9613e23c265a8c2267b..357eaa8b65205cec747bd5baad031eca249d59d8 100644 (file)
--- a/apparmor.d/abstractions/nameservice
+++ b/apparmor.d/abstractions/nameservice
@@ -29,6 +29,11 @@
    /var/lib/extrausers/group  r,
    /var/lib/extrausers/passwd r,
  
+  # NSS records from systemd-userdbd.service
+  /{,var/}run/systemd/userdb/ r,
+  /{,var/}run/systemd/userdb/io.systemd.{NameServiceSwitch,Multiplexer,DynamicUser,Home} r,
+  @{PROC}/sys/kernel/random/boot_id r,
+
    # When using sssd, the passwd and group files are stored in an alternate path
    # and the nss plugin also needs to talk to a pipe
    /var/lib/sss/mc/group   r,
@@ -39,7 +44,7 @@
    /etc/resolv.conf        r,
    # On systems where /etc/resolv.conf is managed programmatically, it is
    # a symlink to /{,var/}run/(whatever program is managing it)/resolv.conf.
-  /{,var/}run/{resolvconf,NetworkManager,systemd/resolve,connman}/resolv.conf r,
+  /{,var/}run/{resolvconf,NetworkManager,systemd/resolve,connman,netconfig}/resolv.conf r,
    /etc/resolvconf/run/resolv.conf r,
    /{,var/}run/systemd/resolve/stub-resolv.conf r,
  
@@ -106,6 +111,29 @@
         member="Resolve{Address,Hostname,Record,Service}"
         peer=(name="org.freedesktop.resolve1"),
  
+  # libnss-systemd
+  #
+  #   https://systemd.io/USER_GROUP_API/
+  #   https://systemd.io/USER_RECORD/
+  #   https://www.freedesktop.org/software/systemd/man/nss-systemd.html
+  #
+  # Allow User/Group lookups via common VarLink socket APIs. Applications need
+  # to either consult all of them or the io.systemd.Multiplexer frontend.
+  /run/systemd/userdb/ r,
+  /run/systemd/userdb/io.systemd.Multiplexer rw,
+  /run/systemd/userdb/io.systemd.DynamicUser rw,        # systemd-exec users
+  /run/systemd/userdb/io.systemd.Home rw,               # systemd-home dirs
+  /run/systemd/userdb/io.systemd.NameServiceSwitch rw,  # UNIX/glibc NSS
+
+  # Also allow lookups for systemd-exec's DynamicUsers via D-Bus
+  #   https://www.freedesktop.org/software/systemd/man/systemd.exec.html
+  dbus send
+       bus=system
+       path="/org/freedesktop/systemd1"
+       interface="org.freedesktop.systemd1.Manager"
+       member="{GetDynamicUsers,LookupDynamicUserByName,LookupDynamicUserByUID}"
+       peer=(name="org.freedesktop.systemd1"),
+
    # TCP/UDP network access
    network inet  stream,
    network inet6 stream,
diff --git a/apparmor.d/abstractions/nvidia b/apparmor.d/abstractions/nvidia

index 5e182a653f24d2b7fa7c7cb50537d7047aa35b05..b01ef8b55978bcd59dfb7985a59b960a23849bfb 100644 (file)
--- a/apparmor.d/abstractions/nvidia
+++ b/apparmor.d/abstractions/nvidia
@@ -4,6 +4,8 @@
    # configuration queries
    capability ipc_lock,
  
+  /usr/share/nvidia/nvidia-application-profiles* r,
+
    # libvdpau config file for nvidia workarounds
    /etc/vdpau_wrapper.cfg r,
  
@@ -17,7 +19,10 @@
    @{PROC}/driver/nvidia/params r,
    @{PROC}/modules r,
  
-  owner @{HOME}/.nv/GLCache/ r,
+  @{sys}/devices/system/memory/block_size_bytes r,
+
+  owner @{HOME}/.nv/ w,
+  owner @{HOME}/.nv/GLCache/ rw,
    owner @{HOME}/.nv/GLCache/** rwk,
  
    unix (send, receive) type=dgram peer=(addr="@nvidia[0-9a-f]*"),
diff --git a/apparmor.d/abstractions/opencl b/apparmor.d/abstractions/opencl

new file mode 100644 (file)

index 0000000..32a21b2
--- /dev/null
+++ b/apparmor.d/abstractions/opencl
@@ -0,0 +1,9 @@
+# vim:syntax=apparmor
+# OpenCL access requirements
+
+  # TODO: use conditionals to select allowed implementations
+  #include <abstractions/opencl-intel>
+  #include <abstractions/opencl-mesa>
+  #include <abstractions/opencl-nvidia>
+  #include <abstractions/opencl-pocl>
+
diff --git a/apparmor.d/abstractions/opencl-common b/apparmor.d/abstractions/opencl-common

new file mode 100644 (file)

index 0000000..0ad3d55
--- /dev/null
+++ b/apparmor.d/abstractions/opencl-common
@@ -0,0 +1,10 @@
+# vim:syntax=apparmor
+# implementation-independent OpenCL access requirements
+
+  # System files
+
+  /etc/OpenCL/** r,
+  @{sys}/bus/pci/devices/ r, # libpocl.so -> libhwlock.so, libnvidia-opencl.so, beignet/libcl.so -> libdrm_intel.so
+  @{sys}/devices/system/node/ r, # for clGetPlatformIDs() from libOpenCL.so
+  @{sys}/devices/system/node/node[0-9]*/meminfo r, # for clGetPlatformIDs() from libOpenCL.so
+
diff --git a/apparmor.d/abstractions/opencl-intel b/apparmor.d/abstractions/opencl-intel

new file mode 100644 (file)

index 0000000..353eeca
--- /dev/null
+++ b/apparmor.d/abstractions/opencl-intel
@@ -0,0 +1,17 @@
+# vim:syntax=apparmor
+# OpenCL access requirements for Intel implementation
+
+  #include <abstractions/opencl-common>
+
+  # for libcl.so (libOpenCL.so -> beignet/libcl.so calls XOpenDisplay())
+  #include <abstractions/X>
+
+  # for libOpenCL.so -> beignet/libcl.so -> libpciaccess.so
+  #include <abstractions/dri-enumerate>
+
+  # System files
+
+  /dev/dri/card[0-9]* rw, # beignet/libcl.so
+  @{sys}/devices/pci[0-9]*/**/{class,config,resource,revision} r, # libcl.so -> libdrm_intel.so -> libpciaccess.so (move to dri-enumerate ?)
+  /usr/lib/@{multiarch}/beignet/** r,
+
diff --git a/apparmor.d/abstractions/opencl-mesa b/apparmor.d/abstractions/opencl-mesa

new file mode 100644 (file)

index 0000000..9d7f82b
--- /dev/null
+++ b/apparmor.d/abstractions/opencl-mesa
@@ -0,0 +1,20 @@
+# vim:syntax=apparmor
+# OpenCL access requirements for Mesa implementation
+
+  #include <abstractions/opencl-common>
+
+  # Additional libraries
+
+  /usr/lib/@{multiarch}/gallium-pipe/*.so mr, # libMesaOpenCL.so
+  /usr/lib{,64}/gallium-pipe/*.so mr, # libMesaOpenCL.so on openSUSE
+
+  # System files
+
+  /dev/dri/ r, # libMesaOpenCL.so -> libdrm.so
+  /dev/dri/render* rw, # libMesaOpenCL.so
+  /etc/drirc r, # libMesaOpenCL.so
+
+  # User files
+
+  owner @{HOME}/.cache/mesa_shader_cache/{,**} rw, # libMesaOpenCL.so -> pipe_nouveau.so
+
diff --git a/apparmor.d/abstractions/opencl-nvidia b/apparmor.d/abstractions/opencl-nvidia

new file mode 100644 (file)

index 0000000..8a4764e
--- /dev/null
+++ b/apparmor.d/abstractions/opencl-nvidia
@@ -0,0 +1,30 @@
+# vim:syntax=apparmor
+# OpenCL access requirements for NVIDIA implementation
+
+  #include <abstractions/nvidia>
+  #include <abstractions/opencl-common>
+
+  # Executables
+
+  # https://github.com/NVIDIA/nvidia-modprobe
+  # This setuid executable is used to create various device files and load the
+  # the nvidia kernel module.
+  /usr/bin/nvidia-modprobe Px -> nvidia_modprobe,
+
+  # System files
+
+  # libnvidia-opencl.so rules:
+  /dev/nvidia-uvm rw,
+  /dev/nvidia-uvm-tools rw,
+  @{sys}/devices/pci[0-9]*/**/config r,
+  @{sys}/devices/system/memory/block_size_bytes r,
+  /usr/share/nvidia/** r,
+  @{PROC}/devices r,
+  @{PROC}/sys/vm/mmap_min_addr r,
+
+  # User files
+
+  owner @{HOME}/.nv/ComputeCache/ w,
+  owner @{HOME}/.nv/ComputeCache/** rw,
+  owner @{HOME}/.nv/ComputeCache/index rwk,
+
diff --git a/apparmor.d/abstractions/opencl-pocl b/apparmor.d/abstractions/opencl-pocl

new file mode 100644 (file)

index 0000000..054689a
--- /dev/null
+++ b/apparmor.d/abstractions/opencl-pocl
@@ -0,0 +1,76 @@
+# vim:syntax=apparmor
+# OpenCL access requirements for POCL implementation
+
+  #include <abstractions/opencl-common>
+
+  # Executables
+
+  /usr/bin/{,@{multiarch}-}ld.bfd Cx -> opencl_pocl_ld,
+  /usr/lib/llvm-[0-9]*.[0-9]*/bin/clang Cx -> opencl_pocl_clang,
+
+  # System files
+
+  / r, # libpocl.so -> libhwloc.so
+  @{sys}/bus/pci/slots/ r, # libpocl.so -> hwloc_topology_load() from libhwloc.so
+  @{sys}/bus/{cpu,node}/devices/ r, # libpocl.so -> libhwlock.so
+  @{sys}/class/net/ r, # libpocl.so -> hwloc_pci_traverse_lookuposdevices_cb() from libhwloc.so
+  @{sys}/devices/pci[0-9]*/**/ r, # for libpocl ->  hwloc_linux_lookup_block_class() from libhwloc.so
+  @{sys}/devices/pci[0-9]*/**/block/*/dev r, # libpocl.so -> hwloc_linux_lookup_host_block_class() from libhwloc.so
+  @{sys}/devices/pci[0-9]*/**/{class,local_cpus} r, # libpocl.so -> libhwlock.so
+  @{sys}/devices/pci[0-9]*/*/net/*/address r, # libpocl.so ->  hwloc_pci_traverse_lookuposdevices_cb() from libhwloc.so
+  @{sys}/devices/system/cpu/ r, # libpocl.so -> libnuma.so
+  @{sys}/devices/system/cpu/cpu[0-9]*/cache/index[0-9]*/* r, # libpocl.so -> libhwloc.so
+  @{sys}/devices/system/cpu/cpu[0-9]*/online r, # libpocl.so -> libhwlock.so
+  @{sys}/devices/system/cpu/cpu[0-9]*/topology/* r, # *_siblings, physical_package_id and lot's of others, for libpocl.so -> libhwloc.so
+  @{sys}/devices/system/cpu/cpufreq/policy[0-9]*/* r, # for clGetPlatformIDs() from libpocl.so
+  @{sys}/devices/system/cpu/possible r, # libpocl.so -> libhwloc.so
+  @{sys}/devices/virtual/dmi/id/{,*} r, # libpocl.so -> libhwloc.so
+  @{sys}/fs/cgroup/cpuset/cpuset.{cpus,mems} r, # libpocl.so -> libhwloc.so
+  @{sys}/kernel/mm/hugepages{/,/**} r, # libpocl.so -> libhwloc.so
+  /usr/share/pocl/** r,
+  /{,var/}run/udev/data/*:* r, # libpocl.so -> hwloc_linux_block_class_fillinfos() from libhwloc.so
+
+  # User files
+
+  owner @{HOME}/.cache/pocl/ w,
+  owner @{HOME}/.cache/pocl/kcache/ w,
+  owner @{HOME}/.cache/pocl/kcache/** rw,
+  owner @{HOME}/.cache/pocl/kcache/**.so mrw, # dangerous!
+  owner @{PROC}/@{pid}/{cgroup,cpuset,status} r, # libpocl.so -> libhwloc.so, status for libpocl.so -> libnuma.so
+
+  # Child profiles
+
+  profile opencl_pocl_ld {
+    #include <abstractions/base>
+
+    # Main executables
+
+    /usr/bin/{,@{multiarch}-}ld.bfd mr,
+
+    # User files
+
+    owner @{HOME}/.cache/pocl/kcache/tempfile*.so rw,
+    owner @{HOME}/.cache/pocl/kcache/**.so.o r,
+  }
+
+  profile opencl_pocl_clang {
+    #include <abstractions/base>
+
+    # Main executables
+
+    /usr/lib/llvm-[0-9]*.[0-9]*/bin/clang mr,
+
+    # Additional executables
+
+    /usr/bin/{,@{multiarch}-}ld.bfd ix, # TODO: transfer to opencl_ld child profile?
+
+    # System files
+
+    /etc/debian-version r,
+    /etc/lsb-release r,
+
+    # User files
+
+    owner @{HOME}/.cache/pocl/kcache/*/*/*/*/*.so{,.o} rw,
+  }
+
diff --git a/apparmor.d/abstractions/php b/apparmor.d/abstractions/php

index 91b31205b43b6d8b1d8d4411b578481c82f62555..4aba2415ca401236c3f23dd8e614c71fedc639a5 100644 (file)
--- a/apparmor.d/abstractions/php
+++ b/apparmor.d/abstractions/php
@@ -19,6 +19,9 @@
    # php extensions
    /usr/lib{64,}/php{,5,7}/*/*.so mr,
  
+  # ICU (unicode support) data tables
+  /usr/share/icu/*/*.dat r,
+
    # php session mmap socket
    /var/lib/php{,5,7}/session_mm_* rwlk,
    # file based session handler
diff --git a/apparmor.d/abstractions/postfix-common b/apparmor.d/abstractions/postfix-common

index 86e38880ee2719974ca866a3c499618818441244..3dc599afee157ef8b3e1dd4998bb46001a1ce1f9 100644 (file)
--- a/apparmor.d/abstractions/postfix-common
+++ b/apparmor.d/abstractions/postfix-common
@@ -17,8 +17,10 @@
  
    # postfix's master can send us signals
    signal receive peer=/usr/lib/postfix/master,
+  signal receive peer=postfix-master,
  
    unix (send, receive) peer=(label=/usr/lib/postfix/master),
+  unix (send, receive) peer=(label=postfix-master),
  
    /etc/mailname         r,
    /etc/postfix/*.cf     r,
diff --git a/apparmor.d/abstractions/private-files b/apparmor.d/abstractions/private-files

index 0a659f13265103d7b3d599a930580a28d741037b..09f6d9bdceb5a0c207287f0f4de0f0cdac107032 100644 (file)
--- a/apparmor.d/abstractions/private-files
+++ b/apparmor.d/abstractions/private-files
@@ -6,6 +6,7 @@
    # lot of false positives when reading contents of directories)
    deny @{HOME}/.*history mrwkl,
    deny @{HOME}/.fetchmail* mrwkl,
+  deny @{HOME}/.mutt** mrwkl,
    deny @{HOME}/.viminfo* mrwkl,
    deny @{HOME}/.*~ mrwkl,
    deny @{HOME}/.*.swp mrwkl,
diff --git a/apparmor.d/abstractions/private-files-strict b/apparmor.d/abstractions/private-files-strict

index 60ea72a06f66f18f9da44fc89b5502817e849809..31934318f3a2b3300f24424c0e0af08b0987ead9 100644 (file)
--- a/apparmor.d/abstractions/private-files-strict
+++ b/apparmor.d/abstractions/private-files-strict
@@ -5,6 +5,7 @@
    #include <abstractions/private-files>
  
    # potentially extremely sensitive files
+  audit deny @{HOME}/.aws/{,**} mrwkl,
    audit deny @{HOME}/.gnupg/{,**} mrwkl,
    audit deny @{HOME}/.ssh/{,**} mrwkl,
    audit deny @{HOME}/.gnome2_private/{,**} mrwkl,
diff --git a/apparmor.d/abstractions/python b/apparmor.d/abstractions/python

index 1e0f1b2a344e234351fccbb2421cd4c94b8301f1..925161c11418597e1f9520a7548fd66d65f55900 100644 (file)
--- a/apparmor.d/abstractions/python
+++ b/apparmor.d/abstractions/python
@@ -10,28 +10,28 @@
  #
  # ------------------------------------------------------------------
  
-  /usr/lib{,32,64}/python{2.[4-7],3.[0-6]}/**.{pyc,so}           mr,
-  /usr/lib{,32,64}/python{2.[4-7],3.[0-6]}/**.{egg,py,pth}       r,
-  /usr/lib{,32,64}/python{2.[4-7],3.[0-6]}/{site,dist}-packages/ r,
-  /usr/lib{,32,64}/python3.[0-6]/lib-dynload/*.so            mr,
+  /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/**.{pyc,so}           mr,
+  /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/**.{egg,py,pth}       r,
+  /usr/lib{,32,64}/python{2.[4-7],3.[0-9]}/{site,dist}-packages/ r,
+  /usr/lib{,32,64}/python3.[0-9]/lib-dynload/*.so            mr,
  
-  /usr/local/lib{,32,64}/python{2.[4-7],3.[0-6]}/**.{pyc,so}           mr,
-  /usr/local/lib{,32,64}/python{2.[4-7],3.[0-6]}/**.{egg,py,pth}       r,
-  /usr/local/lib{,32,64}/python{2.[4-7],3.[0-6]}/{site,dist}-packages/ r,
-  /usr/local/lib{,32,64}/python3.[0-6]/lib-dynload/*.so            mr,
+  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/**.{pyc,so}           mr,
+  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/**.{egg,py,pth}       r,
+  /usr/local/lib{,32,64}/python{2.[4-7],3,3.[0-9]}/{site,dist}-packages/ r,
+  /usr/local/lib{,32,64}/python3.[0-9]/lib-dynload/*.so            mr,
  
    # Site-wide configuration
-  /etc/python{2.[4-7],3.[0-6]}/** r,
+  /etc/python{2.[4-7],3.[0-9]}/** r,
  
    # shared python paths
    /usr/share/{pyshared,pycentral,python-support}/**      r,
    /{var,usr}/lib/{pyshared,pycentral,python-support}/**  r,
    /usr/lib/{pyshared,pycentral,python-support}/**.so     mr,
    /var/lib/{pyshared,pycentral,python-support}/**.pyc    mr,
-  /usr/lib/python3/dist-packages/**.so                   mr,
+  /usr/lib/python3/dist-packages/**.so          mr,
  
    # wx paths
    /usr/lib/wx/python/*.pth r,
  
    # python build configuration and headers
-  /usr/include/python{2.[4-7],3.[0-6]}*/pyconfig.h r,
+  /usr/include/python{2.[4-7],3.[0-9]}*/pyconfig.h r,
diff --git a/apparmor.d/abstractions/qt5 b/apparmor.d/abstractions/qt5

new file mode 100644 (file)

index 0000000..66a574b
--- /dev/null
+++ b/apparmor.d/abstractions/qt5
@@ -0,0 +1,22 @@
+# vim:syntax=apparmor
+# Common rules for Qt5-based applications
+
+  # Additional libraries
+
+  /usr/lib{,64,/@{multiarch}}/qt5/plugins/**.so mr,
+  /usr/lib{,64,/@{multiarch}}/qt5/qml/**.so mr,
+  /usr/lib{,64,/@{multiarch}}/qt5/qml/**.{qmlc,jsc} mr, # Precompiled QML/JavaScript modules
+
+  # System files
+
+  /etc/xdg/QtProject/qtlogging.ini r,
+  /usr/share/qt5/translations/*.qm r,
+  /usr/lib{,64,/@{multiarch}}/qt5/plugins/** r,
+  /usr/lib{,64,/@{multiarch}}/qt5/qml/** r,
+
+  # User files
+
+  owner @{HOME}/.config/QtProject/qtlogging.ini r,
+  owner @{HOME}/.config/QtProject.conf r, # common settings for QFileDialog, etc (application might need write access)
+  owner @{HOME}/.cache/qt_compose_cache_{little,big}_endian_* r, # for "platforminputcontexts" plugins
+
diff --git a/apparmor.d/abstractions/qt5-compose-cache-write b/apparmor.d/abstractions/qt5-compose-cache-write

new file mode 100644 (file)

index 0000000..38cb234
--- /dev/null
+++ b/apparmor.d/abstractions/qt5-compose-cache-write
@@ -0,0 +1,8 @@
+# vim:syntax=apparmor
+# Allow writing cache for Qt5 "platforminputcontexts" plugins
+
+  # User files
+
+  owner @{HOME}/.cache/qt_compose_cache_{little,big}_endian_* rwl -> @{HOME}/.cache/#[0-9]*[0-9],
+  owner @{HOME}/.cache/#[0-9]*[0-9] rw, # QSaveFile (anonymous shared memory)
+
diff --git a/apparmor.d/abstractions/qt5-settings-write b/apparmor.d/abstractions/qt5-settings-write

new file mode 100644 (file)

index 0000000..07d1097
--- /dev/null
+++ b/apparmor.d/abstractions/qt5-settings-write
@@ -0,0 +1,11 @@
+# vim:syntax=apparmor
+# Allow writing shared settings for Qt-based applications
+
+  # User files
+
+  owner @{HOME}/.config/#[0-9]*[0-9] rw,
+  owner @{HOME}/.config/QtProject.conf rwl -> @{HOME}/.config/#[0-9]*[0-9],
+  # for temporary files like QtProject.conf.Aqrgeb
+  owner @{HOME}/.config/QtProject.conf.?????? rwl -> @{HOME}/.config/#[0-9]*[0-9],
+  owner @{HOME}/.config/QtProject.conf.lock rwk,
+
diff --git a/apparmor.d/abstractions/recent-documents-write b/apparmor.d/abstractions/recent-documents-write

new file mode 100644 (file)

index 0000000..d95febb
--- /dev/null
+++ b/apparmor.d/abstractions/recent-documents-write
@@ -0,0 +1,10 @@
+# vim:syntax=apparmor
+# Allow updating recent documents
+
+  # User files
+
+  owner @{HOME}/.local/share/RecentDocuments/ rw,
+  owner @{HOME}/.local/share/RecentDocuments/#[0-9]* rw,
+  owner @{HOME}/.local/share/RecentDocuments/*.desktop rwl -> @{HOME}/.local/share/RecentDocuments/#[0-9]*,
+  owner @{HOME}/.local/share/RecentDocuments/*.lock rwk,
+
diff --git a/apparmor.d/abstractions/samba b/apparmor.d/abstractions/samba

index b6cc4fa2c08de3730ecce96a18c1ca3d59050e64..1cab7309ee4df1d6678b24fa9202e9bc51b87a93 100644 (file)
--- a/apparmor.d/abstractions/samba
+++ b/apparmor.d/abstractions/samba
@@ -19,7 +19,7 @@
    /var/lib/samba/** rwk,
    /var/log/samba/cores/ rw,
    /var/log/samba/cores/** rw,
-  /var/log/samba/log.* w,
+  /var/log/samba/* w,
    /{,var/}run/samba/ w,
    /{,var/}run/samba/*.tdb rw,
  
diff --git a/apparmor.d/abstractions/ssl_certs b/apparmor.d/abstractions/ssl_certs

index 0234fd4b91ceafde0de9d895f2f63e2e01f70ede..b5382ec9631c1c324826ee934c374a52a98c96c5 100644 (file)
--- a/apparmor.d/abstractions/ssl_certs
+++ b/apparmor.d/abstractions/ssl_certs
@@ -27,3 +27,14 @@
    # acmetool
    /var/lib/acme/certs/*/chain r,
    /var/lib/acme/certs/*/cert r,
+
+  # dehydrated
+  /{etc,var/lib}/dehydrated/certs/*/cert*.pem r,
+  /{etc,var/lib}/dehydrated/certs/*/chain*.pem r,
+  /{etc,var/lib}/dehydrated/certs/*/fullchain*.pem r,
+  /{etc,var/lib}/dehydrated/certs/*/ocsp*.der r,
+
+  # certbot
+  /etc/letsencrypt/archive/*/cert*.pem r,
+  /etc/letsencrypt/archive/*/chain*.pem r,
+  /etc/letsencrypt/archive/*/fullchain*.pem r,
diff --git a/apparmor.d/abstractions/ssl_keys b/apparmor.d/abstractions/ssl_keys

index c6f29ad243358d7b43e53c7d808caf4cd20b4a0c..84f5c503d82ce901aa419b561fe3aa4b4b3c78bc 100644 (file)
--- a/apparmor.d/abstractions/ssl_keys
+++ b/apparmor.d/abstractions/ssl_keys
@@ -20,3 +20,9 @@
    /var/lib/acme/live/* r,
    /var/lib/acme/certs/** r,
    /var/lib/acme/keys/** r,
+
+  # dehydrated
+  /{etc,var/lib}/dehydrated/certs/*/privkey*.pem r,
+
+  # certbot / letsencrypt
+  /etc/letsencrypt/archive/*/privkey*.pem r,
diff --git a/apparmor.d/abstractions/ubuntu-browsers b/apparmor.d/abstractions/ubuntu-browsers

index 0d67682a8943e62f0476dceca7240c3315e55648..d4438ad6a6f1d25f75b1d158e17a6ab4c17b0df9 100644 (file)
--- a/apparmor.d/abstractions/ubuntu-browsers
+++ b/apparmor.d/abstractions/ubuntu-browsers
@@ -25,12 +25,12 @@
    /usr/bin/sensible-browser Pixr,
  
    /usr/bin/chromium{,-browser} Cx -> sanitized_helper,
-  /usr/lib/chromium{,-browser}/chromium{,-browser} Cx -> sanitized_helper,
+  /usr/lib{,64}/chromium{,-browser}/chromium{,-browser} Cx -> sanitized_helper,
  
    # this should cover all firefox browsers and versions (including shiretoko
    # and abrowser)
    /usr/bin/firefox Cxr -> sanitized_helper,
-  /usr/lib/firefox*/firefox* Cx -> sanitized_helper,
+  /usr/lib{,64}/firefox*/firefox* Cx -> sanitized_helper,
  
    # Iceweasel
    /usr/bin/iceweasel Cxr -> sanitized_helper,
diff --git a/apparmor.d/abstractions/ubuntu-browsers.d/java b/apparmor.d/abstractions/ubuntu-browsers.d/java

index 269bd528ddea94e50d2032234532e89e5fb15e37..e0a67cf31306e170b62ece2aa9adf1c28ec45923 100644 (file)
--- a/apparmor.d/abstractions/ubuntu-browsers.d/java
+++ b/apparmor.d/abstractions/ubuntu-browsers.d/java
@@ -42,8 +42,8 @@
      @{PROC}/@{pid}/ r,
      @{PROC}/@{pid}/fd/ r,
      @{PROC}/filesystems r,
-    /sys/devices/system/cpu/ r,
-    /sys/devices/system/cpu/** r,
+    @{sys}/devices/system/cpu/ r,
+    @{sys}/devices/system/cpu/** r,
      /usr/share/** r,
      /var/lib/dbus/machine-id r,
  
@@ -90,8 +90,8 @@
      @{PROC}/@{pid}/ r,
      @{PROC}/@{pid}/fd/ r,
      @{PROC}/filesystems r,
-    /sys/devices/system/cpu/ r,
-    /sys/devices/system/cpu/** r,
+    @{sys}/devices/system/cpu/ r,
+    @{sys}/devices/system/cpu/** r,
      /usr/share/** r,
      /var/lib/dbus/machine-id r,
  
diff --git a/apparmor.d/abstractions/ubuntu-browsers.d/multimedia b/apparmor.d/abstractions/ubuntu-browsers.d/multimedia

index 84fbbc85a511d6f9bd253c1721c24768d678d5b3..591d6b854a3017dd8ec8cef59d6b08f7c84a5669 100644 (file)
--- a/apparmor.d/abstractions/ubuntu-browsers.d/multimedia
+++ b/apparmor.d/abstractions/ubuntu-browsers.d/multimedia
@@ -17,6 +17,9 @@
    /usr/bin/gwenview Cxr -> sanitized_helper,
  
    #include <abstractions/ubuntu-media-players>
+  owner @{HOME}/.adobe/ w,
+  owner @{HOME}/.adobe/** rw,
+  owner @{HOME}/.macromedia/ w,
    owner @{HOME}/.macromedia/** rw,
    /opt/real/RealPlayer/mozilla/nphelix.so rm,
    /usr/bin/lpstat Cxr -> sanitized_helper,
diff --git a/apparmor.d/abstractions/ubuntu-email b/apparmor.d/abstractions/ubuntu-email

index 4c6812ac74d06092248200ab17c38adb103d2260..48e0c6f40f327af2e15250bdbea7a5b14c9926f4 100644 (file)
--- a/apparmor.d/abstractions/ubuntu-email
+++ b/apparmor.d/abstractions/ubuntu-email
@@ -20,5 +20,5 @@
    /usr/bin/sylpheed Cx -> sanitized_helper,
    /usr/bin/tkrat Cx -> sanitized_helper,
  
+  /usr/bin/thunderbird Cx -> sanitized_helper, # used by gio-launch-desktop
    /usr/lib/thunderbird*/thunderbird{,.sh,-bin} Cx -> sanitized_helper,
-
diff --git a/apparmor.d/abstractions/ubuntu-helpers b/apparmor.d/abstractions/ubuntu-helpers

index 6e89c1464cd5799f759ce0691be7aeeb87ab4d72..a1ab7bc049fd59b1dd0dd7556e978f1d311aca8b 100644 (file)
--- a/apparmor.d/abstractions/ubuntu-helpers
+++ b/apparmor.d/abstractions/ubuntu-helpers
@@ -49,9 +49,7 @@ profile sanitized_helper {
  
    # Allow exec of anything, but under this profile. Allow transition
    # to other profiles if they exist.
-  /{usr/,}bin/* Pixr,
-  /{usr/,}sbin/* Pixr,
-  /usr/local/bin/* Pixr,
+  /{usr/,usr/local/,}{bin,sbin}/* Pixr,
  
    # Allow exec of libexec applications in /usr/lib* and /usr/local/lib*
    /usr/{,local/}lib*/{,**/}* Pixr,
diff --git a/apparmor.d/abstractions/video b/apparmor.d/abstractions/video

index 61cebaed6d8d9591ca6573670a5149873302d5d3..00a834681d272b991bc5038b54647654ff3b836a 100644 (file)
--- a/apparmor.d/abstractions/video
+++ b/apparmor.d/abstractions/video
@@ -2,5 +2,5 @@
  # video device access
  
    # System devices
-  /sys/class/video4linux r,
-  /sys/class/video4linux/** r,
+  @{sys}/class/video4linux r,
+  @{sys}/class/video4linux/** r,
diff --git a/apparmor.d/abstractions/vulkan b/apparmor.d/abstractions/vulkan

new file mode 100644 (file)

index 0000000..7f0d8cb
--- /dev/null
+++ b/apparmor.d/abstractions/vulkan
@@ -0,0 +1,15 @@
+# vim:syntax=apparmor
+# Vulkan access requirements
+
+  # System files
+  /dev/dri/ r, # libvulkan_radeon.so, libvulkan_intel.so (Mesa)
+  /etc/vulkan/icd.d/{,*.json} r,
+  /etc/vulkan/{explicit,implicit}_layer.d/{,*.json} r,
+  # for drmGetMinorNameForFD() from libvulkan_intel.so (Mesa)
+  @{sys}/devices/pci[0-9]*/*/drm/ r,
+  /usr/share/vulkan/icd.d/{,*.json} r,
+  /usr/share/vulkan/{explicit,implicit}_layer.d/{,*.json} r,
+
+  # User files
+  owner @{HOME}/.local/share/vulkan/implicit_layer.d/{,*.json} r,
+
diff --git a/apparmor.d/apache2.d/phpsysinfo b/apparmor.d/apache2.d/phpsysinfo

index 669f7a4916add14e087cc64f5ecf3e310fa2db3e..af730910eebe98ccfa9c76bc78126dce2295e080 100644 (file)
--- a/apparmor.d/apache2.d/phpsysinfo
+++ b/apparmor.d/apache2.d/phpsysinfo
@@ -20,13 +20,13 @@
      /etc/phpsysinfo/config.php r,
      /etc/udev/udev.conf r,
      @{PROC}/** r,
-    /sys/bus/ r,
-    /sys/bus/pci/devices/ r,
-    /sys/bus/pci/slots/ r,
-    /sys/bus/pci/slots/** r,
-    /sys/bus/usb/devices/ r,
-    /sys/class/ r,
-    /sys/devices/** r,
+    @{sys}/bus/ r,
+    @{sys}/bus/pci/devices/ r,
+    @{sys}/bus/pci/slots/ r,
+    @{sys}/bus/pci/slots/** r,
+    @{sys}/bus/usb/devices/ r,
+    @{sys}/class/ r,
+    @{sys}/devices/** r,
      /usr/bin/ r,
      /usr/bin/apt-cache ixr,
      /usr/bin/dpkg-query ixr,
diff --git a/apparmor.d/bin.ping b/apparmor.d/bin.ping

index 6c3faa67faa8370c4a6e2cdf5d4f39419de12d3a..f0ef3f04e5bb4009443548574307422baa30617f 100644 (file)
--- a/apparmor.d/bin.ping
+++ b/apparmor.d/bin.ping
@@ -10,7 +10,7 @@
  # ------------------------------------------------------------------
  
  #include <tunables/global>
-profile ping /{usr/,}bin/ping flags=(complain) {
+profile ping /{usr/,}bin/{,iputils-}ping flags=(complain) {
    #include <abstractions/base>
    #include <abstractions/consoles>
    #include <abstractions/nameservice>
@@ -20,7 +20,7 @@ profile ping /{usr/,}bin/ping flags=(complain) {
    network inet raw,
    network inet6 raw,
  
-  /{,usr/}bin/ping mixr,
+  /{,usr/}bin/{,iputils-}ping mixr,
    /etc/modules.conf r,
  
    # Site-specific additions and overrides. See local/README for details.
diff --git a/apparmor.d/local/lsb_release b/apparmor.d/local/lsb_release

new file mode 100644 (file)

index 0000000..e69de29
diff --git a/apparmor.d/local/nvidia_modprobe b/apparmor.d/local/nvidia_modprobe

new file mode 100644 (file)

index 0000000..e69de29
diff --git a/apparmor.d/lsb_release b/apparmor.d/lsb_release

new file mode 100644 (file)

index 0000000..5c05ba4
--- /dev/null
+++ b/apparmor.d/lsb_release
@@ -0,0 +1,50 @@
+# Note: This profile does not specify an attachment path because it is
+# intended to be used only via "Px -> lsb_release" exec transitions from
+# other profiles. We want to confine the lsb_release(1) utility when it
+# is invoked from other confined applications, but not when it is used
+# in regular (unconfined) shell scripts or run directly by the user.
+
+#include <tunables/global>
+
+# Do not attach to /usr/bin/lsb_release by default
+profile lsb_release {
+  #include <abstractions/base>
+  #include <abstractions/python>
+
+  owner @{PROC}/@{pid}/fd/ r,
+
+  /dev/tty rw,
+
+  /usr/bin/lsb_release r,
+  /usr/bin/python3.[0-9] mr,
+
+  /etc/debian_version r,
+  /etc/default/apport r,
+  /etc/dpkg/origins/** r,
+  /etc/lsb-release r,
+  /etc/lsb-release.d/ r,
+
+  /{usr/,}bin/bash ixr,
+  /{usr/,}bin/dash ixr,
+  /usr/bin/basename ixr,
+  /usr/bin/dpkg-query ixr,
+  /usr/bin/getopt ixr,
+  /usr/bin/sed ixr,
+  /usr/bin/tr ixr,
+
+  # TODO - many more permissions needed for this to work
+  deny /usr/bin/apt-cache x,
+
+  /usr/bin/ r,
+  /usr/include/python*/pyconfig.h r,
+  /usr/share/distro-info/** r,
+  /usr/share/dpkg/** r,
+  /usr/share/terminfo/** r,
+  /var/lib/dpkg/** r,
+
+  # file_inherit
+  deny /tmp/gtalkplugin.log w,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/lsb_release>
+}
diff --git a/apparmor.d/nvidia_modprobe b/apparmor.d/nvidia_modprobe

new file mode 100644 (file)

index 0000000..01f714c
--- /dev/null
+++ b/apparmor.d/nvidia_modprobe
@@ -0,0 +1,63 @@
+# vim:syntax=apparmor
+
+#include <tunables/global>
+
+profile nvidia_modprobe {
+  #include <abstractions/base>
+
+  # Capabilities
+
+  capability chown,
+  capability mknod,
+  capability setuid,
+  capability sys_admin,
+
+  # Main executable
+
+  /usr/bin/nvidia-modprobe mr,
+
+  # Other executables
+
+  /usr/bin/kmod Cx -> kmod,
+
+  # System files
+
+  /dev/nvidia-uvm w,
+  /dev/nvidia-uvm-tools w,
+  @{sys}/bus/pci/devices/ r,
+  @{sys}/devices/pci[0-9]*/**/config r,
+  @{PROC}/devices r,
+  @{PROC}/modules r,
+  @{PROC}/sys/kernel/modprobe r,
+
+  # Child profiles
+
+  profile kmod {
+    #include <abstractions/base>
+
+    # Capabilities
+
+    capability sys_module,
+
+    # Main executable
+
+    /usr/bin/kmod mrix,
+
+    # Other executables
+
+    /{,usr/}bin/{,ba,da}sh ix,
+
+    # System files
+
+    /etc/modprobe.d/{,*.conf} r,
+    /etc/nvidia/current/*.conf r,
+    @{sys}/module/ipmi_devintf/initstate r,
+    @{sys}/module/ipmi_msghandler/initstate r,
+    @{sys}/module/nvidia/initstate r,
+    @{PROC}/cmdline r,
+  }
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/nvidia_modprobe>
+}
+
diff --git a/apparmor.d/sbin.klogd b/apparmor.d/sbin.klogd

index aa945523492ed91423928c528d2ef14cad5d5a8a..8f4b22d32229b7ef94ec0f85b26a0ecd573f9bae 100644 (file)
--- a/apparmor.d/sbin.klogd
+++ b/apparmor.d/sbin.klogd
@@ -11,7 +11,7 @@
  
  #include <tunables/global>
  
-profile klogd /{usr/,}sbin/klogd flags=(complain) {
+profile klogd /{usr/,}{bin,sbin}/klogd flags=(complain) {
    #include <abstractions/base>
  
    capability sys_admin, # for backward compatibility with kernel <= 2.6.37
@@ -21,10 +21,10 @@ profile klogd /{usr/,}sbin/klogd flags=(complain) {
  
    /boot/System.map*     r,
    @{PROC}/kmsg         r,
-  @{PROC}/kallsyms             r,
+  @{PROC}/kallsyms     r,
    /dev/tty             rw,
  
-  /{usr/,}sbin/klogd           rmix,
+  /{usr/,}{bin,sbin}/klogd     rmix,
    /var/log/boot.msg     rwl,
    /{,var/}run/klogd.pid    krwl,
    /{,var/}run/klogd/klogd.pid krwl,
diff --git a/apparmor.d/sbin.syslog-ng b/apparmor.d/sbin.syslog-ng

index ef8da9b6c33b333dac65d6d13376c10a8a583370..b03af238cc2af3d7e7186f403e8417d08cf9eefb 100644 (file)
--- a/apparmor.d/sbin.syslog-ng
+++ b/apparmor.d/sbin.syslog-ng
@@ -15,12 +15,13 @@
  #define this to be where syslog-ng is chrooted
  @{CHROOT_BASE}=""
  
-profile syslog-ng /{usr/,}sbin/syslog-ng flags=(complain) {
+profile syslog-ng /{usr/,}{bin,sbin}/syslog-ng flags=(complain) {
    #include <abstractions/base>
    #include <abstractions/consoles>
    #include <abstractions/nameservice>
    #include <abstractions/mysql>
    #include <abstractions/openssl>
+  #include <abstractions/python>
  
    capability chown,
    capability dac_override,
@@ -46,8 +47,8 @@ profile syslog-ng /{usr/,}sbin/syslog-ng flags=(complain) {
    @{PROC}/kmsg r,
    /etc/hosts.deny r,
    /etc/hosts.allow r,
-  /{usr/,}sbin/syslog-ng mr,
-  /sys/devices/system/cpu/online r,
+  /{usr/,}{bin,sbin}/syslog-ng mr,
+  @{sys}/devices/system/cpu/online r,
    /usr/share/syslog-ng/** r,
    /var/lib/syslog-ng/syslog-ng-?????.qf rw,
    # chrooted applications
diff --git a/apparmor.d/sbin.syslogd b/apparmor.d/sbin.syslogd

index 1466db54f023e66116d078b19d41f82b2c5026d4..1b54029deee538d909c24da3eab1ff93f498d4de 100644 (file)
--- a/apparmor.d/sbin.syslogd
+++ b/apparmor.d/sbin.syslogd
@@ -11,7 +11,7 @@
  
  #include <tunables/global>
  
-profile syslogd /{usr/,}sbin/syslogd flags=(complain) {
+profile syslogd /{usr/,}{bin,sbin}/syslogd flags=(complain) {
    #include <abstractions/base>
    #include <abstractions/nameservice>
    #include <abstractions/consoles>
@@ -32,7 +32,7 @@ profile syslogd /{usr/,}sbin/syslogd flags=(complain) {
    /dev/tty*                     w,
    /dev/xconsole                 rw,
    /etc/syslog.conf              r,
-  /{usr/,}sbin/syslogd                 rmix,
+  /{usr/,}{bin,sbin}/syslogd    rmix,
    /var/log/**                   rw,
    /{,var/}run/syslogd.pid          krwl,
    /{,var/}run/utmp                 rw,
diff --git a/apparmor.d/tunables/global b/apparmor.d/tunables/global

index 58d087fbe76dbb0574d1f6e77fad6298491ff3c3..28d6fc6dc09d5db20e6f88d5e905a78734244517 100644 (file)
--- a/apparmor.d/tunables/global
+++ b/apparmor.d/tunables/global
@@ -18,3 +18,4 @@
  #include <tunables/alias>
  #include <tunables/kernelvars>
  #include <tunables/xdg-user-dirs>
+#include <tunables/share>
diff --git a/apparmor.d/tunables/kernelvars b/apparmor.d/tunables/kernelvars

index 7933c522c488bb9a7c8cb3af5a87803051fb80e8..65ee2667f26054c2cf0c3a696eba496e056fc948 100644 (file)
--- a/apparmor.d/tunables/kernelvars
+++ b/apparmor.d/tunables/kernelvars
@@ -20,3 +20,14 @@
  
  #A pattern for pids that can appear
  @{pids}=@{pid}
+
+# Placeholder for user id until kernel var is implemented to match
+# current user of the confined application.
+# Values are 0...4,294,967,295 (32-bit unsigned, 10 digits).
+@{uid}={[0-9],[1-9][0-9],[1-9][0-9][0-9],[1-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9],[1-4][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]}
+
+#same pattern as @{uid} for now
+@{uids}=@{uid}
+
+# until kernel var is implemented
+@{sys}=/sys/
diff --git a/apparmor.d/tunables/securityfs b/apparmor.d/tunables/securityfs

index 1350fee97f33143dd58831808fd5b96e60d89764..c572139fb57a069e69b75da68aa4fe0733527339 100644 (file)
--- a/apparmor.d/tunables/securityfs
+++ b/apparmor.d/tunables/securityfs
@@ -6,7 +6,5 @@
  #
  # ------------------------------------------------------------------
  
-#include <tunables/sys>
-
  # @{securityfs} is the location where securityfs is mounted.
  @{securityfs}=@{sys}/kernel/security/
diff --git a/apparmor.d/tunables/share b/apparmor.d/tunables/share

new file mode 100644 (file)

index 0000000..f41121c
--- /dev/null
+++ b/apparmor.d/tunables/share
@@ -0,0 +1,15 @@
+@{flatpak_exports_root} = {flatpak/exports,flatpak/{app,runtime}/*/*/*/*/export}
+
+# System-wide directories with behaviour analogous to /usr/share
+# in patterns like the freedesktop.org basedir spec. These are
+# owned by root or a system user, appear in XDG_DATA_DIRS, and
+# are the parent directory for `applications`, `themes`,
+# `dbus-1/services`, etc.
+@{system_share_dirs} = /{usr,usr/local,var/lib/@{flatpak_exports_root}}/share
+
+# Per-user/personal directories with behaviour analogous to
+# ~/.local/share in patterns like the freedesktop.org basedir spec.
+# These are owned by the user running an application, appear in
+# XDG_DATA_DIRS or XDG_DATA_HOME, and are the parent directory
+# for the same subdirectories as @{system_share_dirs}
+@{user_share_dirs} = @{HOME}/.local{,/share/@{flatpak_exports_root}}/share
diff --git a/apparmor.d/tunables/sys b/apparmor.d/tunables/sys

index e49702cb80c7cc0b419ca9fd0b4730b503b7bd22..c5257e30c2c3fd1cf5d46100897eac8f2ad199c4 100644 (file)
--- a/apparmor.d/tunables/sys
+++ b/apparmor.d/tunables/sys
@@ -6,5 +6,4 @@
  #
  # ------------------------------------------------------------------
  
-# @{sys} is the location where sysfs is mounted.
-@{sys}=/sys/
+#This file is DEPRECATED! @{sys} is defined in tunables/kernelvars now.
diff --git a/apparmor.d/usr.bin.chromium-browser b/apparmor.d/usr.bin.chromium-browser

index 34838ea5b57b9309beba41fdc0b9c565b675a4d3..687290e55c26bc38bec9d1caae266c4227048e8e 100644 (file)
--- a/apparmor.d/usr.bin.chromium-browser
+++ b/apparmor.d/usr.bin.chromium-browser
@@ -1,11 +1,14 @@
  # Author: Jamie Strandboge <jamie@canonical.com>
  #include <tunables/global>
  
+@{chromium} = chromium{,-browser}
+
  # We need 'flags=(attach_disconnected)' in newer chromium versions
-/usr/lib/chromium-browser/chromium-browser flags=(complain,attach_disconnected) {
+profile chromium_browser /usr/lib/@{chromium}/@{chromium} flags=(complain,attach_disconnected) {
    #include <abstractions/audio>
    #include <abstractions/cups-client>
    #include <abstractions/dbus-session>
+  #include <abstractions/dbus-strict>
    #include <abstractions/gnome>
    #include <abstractions/ibus>
    #include <abstractions/nameservice>
@@ -16,6 +19,39 @@
    # accordingly.
    #include <abstractions/ubuntu-browsers.d/chromium-browser>
  
+  capability sys_admin,
+  capability sys_chroot,
+  capability sys_ptrace,
+
+  # UPower
+  # Not sure why these are needed, so deny for now
+  deny dbus (send)
+       bus=system
+       path=/org/freedesktop/UPower
+       interface=org.freedesktop.DBus.Properties
+       member=Get
+       peer=(label=unconfined),
+  deny dbus (send)
+       bus=system
+       path=/org/freedesktop/UPower/devices/*
+       interface=org.freedesktop.DBus.Properties
+       member=Get
+       peer=(label=unconfined),
+  deny dbus (send)
+       bus=system
+       path=/org/freedesktop/UPower
+       interface=org.freedesktop.UPower
+       member={EnumerateDevices,GetDisplayDevice}
+       peer=(label=unconfined),
+
+  # ???
+  deny dbus (send)
+       bus=system
+       path=/org/freedesktop/hostname1
+       interface=org.freedesktop.DBus.Properties
+       member=GetAll
+       peer=(label=unconfined),
+
    # Networking
    network inet stream,
    network inet6 stream,
@@ -29,37 +65,48 @@
    /etc/xdg/xubuntu/applications/defaults.list r,
    owner @{HOME}/.local/share/applications/defaults.list r,
    owner @{HOME}/.local/share/applications/mimeinfo.cache r,
+  /tmp/.X[0-9]*-lock r,
  
+  @{PROC}/self/exe ixr,
    @{PROC}/[0-9]*/fd/ r,
    @{PROC}/filesystems r,
-  @{PROC}/ r,
    @{PROC}/vmstat r,
+  @{PROC}/ r,
    @{PROC}/[0-9]*/task/[0-9]*/stat r,
-  @{PROC}/[0-9]*/task/[0-9]*/status r,
    owner @{PROC}/[0-9]*/cmdline r,
    owner @{PROC}/[0-9]*/io r,
-  @{PROC}/[0-9]*/smaps r,
    owner @{PROC}/[0-9]*/setgroups w,
+  owner @{PROC}/[0-9]*/{uid,gid}_map w,
+  @{PROC}/[0-9]*/smaps r,
    @{PROC}/[0-9]*/stat r,
    @{PROC}/[0-9]*/statm r,
-  @{PROC}/[0-9]*/status r,
+  owner @{PROC}/[0-9]*/status r,
+  owner @{PROC}/[0-9]*/task/[0-9]*/status r,
    deny @{PROC}/[0-9]*/oom_{,score_}adj w,
    @{PROC}/sys/kernel/yama/ptrace_scope r,
+  @{PROC}/sys/net/ipv4/tcp_fastopen r,
  
    # Newer chromium needs these now
    /etc/udev/udev.conf r,
+  # Chromium appears to want all "uevent" files under /sys/devices/
+  /sys/devices/**/uevent r,
+  /sys/devices/system/cpu/cpufreq/policy*/cpuinfo_max_freq r,
    /sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_max_freq r,
-  /sys/devices/pci[0-9a-f]*/**/class r,
-  /sys/devices/pci[0-9a-f]*/**/device r,
-  /sys/devices/pci[0-9a-f]*/**/irq r,
-  /sys/devices/pci[0-9a-f]*/**/resource r,
-  /sys/devices/pci[0-9a-f]*/**/vendor r,
-  /sys/devices/pci[0-9a-f]*/**/removable r,
-  /sys/devices/pci[0-9a-f]*/**/block/**/size r,
+  /sys/devices/system/node/node*/meminfo r,
+  /sys/devices/pci[0-9]*/**/class r,
+  /sys/devices/pci[0-9]*/**/config r,
+  /sys/devices/pci[0-9]*/**/device r,
+  /sys/devices/pci[0-9]*/**/irq r,
+  /sys/devices/pci[0-9]*/**/resource r,
+  /sys/devices/pci[0-9]*/**/revision r,
+  /sys/devices/pci[0-9]*/**/subsystem_device r,
+  /sys/devices/pci[0-9]*/**/subsystem_vendor r,
+  /sys/devices/pci[0-9]*/**/vendor r,
+  /sys/devices/pci[0-9]*/**/removable r,
+  /sys/devices/pci[0-9]*/**/block/**/size r,
    /sys/devices/virtual/block/**/removable r,
    /sys/devices/virtual/block/**/size r,
-  /sys/devices/**/uevent r,
-  /sys/devices/virtual/tty/tty0/active r,
+  /sys/devices/virtual/tty/tty*/active r,
    # This is requested, but doesn't seem to actually be needed so deny for now
    deny /run/udev/data/** r,
  
@@ -80,14 +127,17 @@
    owner /{dev,run}/shm/{,.}org.chromium.* mrw,
    owner /{,var/}run/shm/shmfd-* mrw,
  
-  /usr/lib/chromium-browser/*.pak mr,
-  /usr/lib/chromium-browser/locales/* mr,
+  /usr/lib/@{chromium}/*.pak mr,
+  /usr/lib/@{chromium}/locales/* mr,
  
    # Noisy
-  deny /usr/lib/chromium-browser/** w,
+  deny /usr/lib/@{chromium}/** w,
+  deny /var/cache/fontconfig/ w,
  
-  # Allow ptracing ourselves
+  # Allow ptracing ourselves and our helpers
    ptrace (trace) peer=@{profile_name},
+  ptrace (trace) peer=@{profile_name}//lsb_release,
+  ptrace (trace) peer=@{profile_name}//xdgsettings,
  
    # Make browsing directories work
    / r,
@@ -121,7 +171,7 @@
    owner @{HOME}/.mozilla/** k,
  
    # Chromium Policies
-  /etc/chromium-browser/policies/** r,
+  /etc/@{chromium}/policies/** r,
  
    # Chromium configuration
    owner @{HOME}/.pki/nssdb/* rwk,
@@ -135,101 +185,103 @@
    owner @{HOME}/.config/chromium/**/Dictionaries/*.bdic mr,
  
    # Allow transitions to ourself and our sandbox
-  /usr/lib/chromium-browser/chromium-browser ix,
-  /usr/lib/chromium-browser/chromium-browser-sandbox cx -> chromium_browser_sandbox,
-  /usr/lib/chromium-browser/chrome-sandbox cx -> chromium_browser_sandbox,
+  /usr/lib/@{chromium}/@{chromium} ix,
+  /usr/lib/@{chromium}/chrome-sandbox cx -> chromium_browser_sandbox,
  
    # Allow communicating with sandbox
-  unix (receive, send) peer=(label=/usr/lib/chromium-browser/chromium-browser//chromium_browser_sandbox),
+  unix (receive, send) peer=(label=/usr/lib/@{chromium}/@{chromium}//chromium_browser_sandbox),
  
-  /bin/ps Uxr,
-  /usr/lib/chromium-browser/xdg-settings Cxr -> xdgsettings,
+  /{usr/,}bin/ps Uxr,
+  /usr/lib/@{chromium}/xdg-settings Cxr -> xdgsettings,
    /usr/bin/xdg-settings Cxr -> xdgsettings,
-  ptrace (trace) peer=@{profile_name}//xdgsettings,
    /usr/bin/lsb_release Cxr -> lsb_release,
-  ptrace (trace) peer=@{profile_name}//lsb_release,
  
    # GSettings
    owner /{,var/}run/user/*/dconf/     rw,
    owner /{,var/}run/user/*/dconf/user rw,
    owner @{HOME}/.config/dconf/user r,
  
-  profile xdgsettings flags=(complain,attach_disconnected) {
+  # Magnet links
+  /usr/bin/gio ixr,
+
+  # Chrome Gnome Shell Integration
+  /etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json r,
+  /usr/bin/chrome-gnome-shell ixr,
+
+  profile xdgsettings flags=(complain) {
      #include <abstractions/bash>
      #include <abstractions/gnome>
  
-    /bin/dash ixr,
+    /{usr/,}bin/dash ixr,
  
      /etc/ld.so.cache r,
+    /etc/xdg/** r,
      /usr/bin/xdg-settings r,
-    /usr/lib/chromium-browser/xdg-settings r,
+    /usr/lib/@{chromium}/xdg-settings r,
      /usr/share/applications/*.desktop r,
-    /usr/share/ubuntu/applications/ r,
+    /usr/share/applications/*.list r,
  
      # Checking default browser
-    /bin/grep ixr,
-    /bin/readlink ixr,
-    /bin/sed ixr,
-    /bin/which ixr,
+    /{usr/,}bin/grep ixr,
+    /{usr/,}bin/head ixr,
+    /{usr/,}bin/readlink ixr,
+    /{usr/,}bin/sed ixr,
+    /{usr/,}bin/tr ixr,
+    /{usr/,}bin/which ixr,
      /usr/bin/basename ixr,
      /usr/bin/cut ixr,
  
      # Setting the default browser
-    /bin/mkdir ixr,
-    /bin/mv ixr,
-    /bin/touch ixr,
+    /{usr/,}bin/mkdir ixr,
+    /{usr/,}bin/mv ixr,
+    /{usr/,}bin/touch ixr,
      /usr/bin/dirname ixr,
      /usr/bin/gconftool-2 ix,
      /usr/bin/[gm]awk ixr,
-    /usr/bin/head ixr,
-    /usr/bin/tr ixr,
      /usr/bin/xdg-mime ixr,
      owner @{HOME}/.local/share/applications/ w,
      owner @{HOME}/.local/share/applications/mimeapps.list* rw,
    }
  
-  profile lsb_release flags=(complain,attach_disconnected) {
+  profile lsb_release flags=(complain) {
      #include <abstractions/base>
      #include <abstractions/python>
      /usr/bin/lsb_release r,
-    /bin/dash ixr,
+    /{usr/,}bin/dash ixr,
      /usr/bin/dpkg-query ixr,
      /usr/include/python2.[4567]/pyconfig.h r,
      /etc/lsb-release r,
      /etc/debian_version r,
+    /etc/dpkg/origins/** r,
+    /usr/share/distro-info/** r,
      /var/lib/dpkg/** r,
  
-    /usr/local/lib/python3.[0-4]/dist-packages/ r,
+    /usr/local/lib/python3.[0-9]/dist-packages/ r,
      /usr/bin/ r,
-    /usr/bin/python3.[0-6] mr,
-
-    /etc/default/apport r,
-    /etc/apt/apt.conf.d/ r,
-    /usr/share/dpkg/cputable r,
-    /usr/share/distro-info/* r,
+    /usr/bin/python3.[0-9] mr,
    }
  
  
    # Site-specific additions and overrides. See local/README for details.
    #include <local/usr.bin.chromium-browser>
  
-profile chromium_browser_sandbox flags=(complain,attach_disconnected) {
+  profile chromium_browser_sandbox flags=(complain) {
      # Be fanatical since it is setuid root and don't use an abstraction
-    /lib/libgcc_s.so* mr,
-    /lib/@{multiarch}/libgcc_s.so* mr,
-    /lib{,32,64}/libm-*.so* mr,
-    /lib/@{multiarch}/libm-*.so* mr,
-    /lib{,32,64}/libpthread-*.so* mr,
-    /lib/@{multiarch}/libpthread-*.so* mr,
-    /lib{,32,64}/libc-*.so* mr,
-    /lib/@{multiarch}/libc-*.so* mr,
-    /lib{,32,64}/libld-*.so* mr,
-    /lib/@{multiarch}/libld-*.so* mr,
-    /lib{,32,64}/ld-*.so* mr,
-    /lib/@{multiarch}/ld-*.so* mr,
-    /lib/tls/*/{cmov,nosegneg}/libm-*.so* mr,
-    /lib/tls/*/{cmov,nosegneg}/libpthread-*.so* mr,
-    /lib/tls/*/{cmov,nosegneg}/libc-*.so* mr,
+    /{usr/,}lib/libgcc_s.so* mr,
+    /{usr/,}lib/@{multiarch}/libgcc_s.so* mr,
+    /{usr/,}lib{,32,64}/libm-*.so* mr,
+    /{usr/,}lib/@{multiarch}/libm-*.so* mr,
+    /{usr/,}lib{,32,64}/libpthread-*.so* mr,
+    /{usr/,}lib/@{multiarch}/libpthread-*.so* mr,
+    /{usr/,}lib{,32,64}/libc-*.so* mr,
+    /{usr/,}lib/@{multiarch}/libc-*.so* mr,
+    /{usr/,}lib{,32,64}/libld-*.so* mr,
+    /{usr/,}lib/@{multiarch}/libld-*.so* mr,
+    /{usr/,}lib{,32,64}/ld-*.so* mr,
+    /{usr/,}lib/@{multiarch}/ld-*.so* mr,
+    /{usr/,}lib/tls/*/{cmov,nosegneg}/libm-*.so* mr,
+    /{usr/,}lib/tls/*/{cmov,nosegneg}/libpthread-*.so* mr,
+    /{usr/,}lib/tls/*/{cmov,nosegneg}/libc-*.so* mr,
      /usr/lib/libstdc++.so* mr,
      /usr/lib/@{multiarch}/libstdc++.so* mr,
      /etc/ld.so.cache r,
@@ -253,9 +305,9 @@ profile chromium_browser_sandbox flags=(complain,attach_disconnected) {
      signal (receive) peer=unconfined,
      signal peer=@{profile_name},
      signal (receive, send) set=("exists"),
-    signal (receive) peer=/usr/lib/chromium-browser/chromium-browser,
+    signal (receive) peer=/usr/lib/@{chromium}/@{chromium},
  
-    unix (receive, send) peer=(label=/usr/lib/chromium-browser/chromium-browser),
+    unix (receive, send) peer=(label=/usr/lib/@{chromium}/@{chromium}),
      unix (create),
      unix peer=(label=@{profile_name}),
      unix (getattr, getopt, setopt, shutdown) addr=none,
@@ -268,10 +320,9 @@ profile chromium_browser_sandbox flags=(complain,attach_disconnected) {
      @{PROC}/[0-9]*/status r,
      @{PROC}/[0-9]*/task/[0-9]*/stat r,
  
-    /usr/bin/chromium-browser r,
-    /usr/lib/chromium-browser/chromium-browser Px,
-    /usr/lib/chromium-browser/chromium-browser-sandbox mr,
-    /usr/lib/chromium-browser/chrome-sandbox mr,
+    /usr/bin/@{chromium} r,
+    /usr/lib/@{chromium}/@{chromium} Px,
+    /usr/lib/@{chromium}/chrome-sandbox mr,
  
      /dev/null rw,
  
diff --git a/apparmor.d/usr.lib.dovecot.anvil b/apparmor.d/usr.lib.dovecot.anvil

deleted file mode 100644 (file)

index 3d54bc4..0000000
--- a/apparmor.d/usr.lib.dovecot.anvil
+++ /dev/null
@@ -1,26 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-
-/usr/lib/dovecot/anvil flags=(complain) {
-  #include <abstractions/base>
-  #include <abstractions/dovecot-common>
-
-  capability setuid,
-  capability sys_chroot,
-
-  /run/dovecot/anvil rw,
-  /usr/lib/dovecot/anvil mr,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.anvil>
-}
diff --git a/apparmor.d/usr.lib.dovecot.auth b/apparmor.d/usr.lib.dovecot.auth

deleted file mode 100644 (file)

index a6641b0..0000000
--- a/apparmor.d/usr.lib.dovecot.auth
+++ /dev/null
@@ -1,53 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2013 Christian Boltz
-#    Copyright (C) 2014 Christian Wittmer
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-
-/usr/lib/dovecot/auth flags=(complain) {
-  #include <abstractions/authentication>
-  #include <abstractions/base>
-  #include <abstractions/mysql>
-  #include <abstractions/nameservice>
-  #include <abstractions/openssl>
-  #include <abstractions/wutmp>
-  #include <abstractions/dovecot-common>
-
-  capability audit_write,
-  capability dac_override,
-  capability dac_read_search,
-  capability setuid,
-
-  /etc/my.cnf r,
-  /etc/my.cnf.d/ r,
-  /etc/my.cnf.d/*.cnf r,
-
-  /etc/dovecot/* r,
-  /usr/lib/dovecot/auth mr,
-
-  # kerberos replay cache
-  /var/tmp/imap_* rw,
-  /var/tmp/pop_* rw,
-  /var/tmp/sieve_* rw,
-  /var/tmp/smtp_* rw,
-
-  /run/dovecot/auth-master rw,
-  /run/dovecot/auth-worker rw,
-  /run/dovecot/login/login rw,
-  /{var/,}run/dovecot/auth-token-secret.dat{,.tmp} rw,
-  /{var/,}run/dovecot/stats-user rw,
-  /{var/,}run/dovecot/anvil-auth-penalty rw,
-
-  /var/spool/postfix/private/auth w,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.auth>
-}
diff --git a/apparmor.d/usr.lib.dovecot.config b/apparmor.d/usr.lib.dovecot.config

deleted file mode 100644 (file)

index 4dc4d8f..0000000
--- a/apparmor.d/usr.lib.dovecot.config
+++ /dev/null
@@ -1,30 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-
-/usr/lib/dovecot/config flags=(complain) {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/dovecot-common>
-  #include <abstractions/ssl_keys>
-
-  capability dac_override,
-
-  /etc/dovecot/** r,
-  /usr/bin/doveconf rix,
-  /usr/lib/dovecot/config mr,
-  /usr/lib/dovecot/managesieve Px,
-  /usr/share/dovecot/** r,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.config>
-}
diff --git a/apparmor.d/usr.lib.dovecot.deliver b/apparmor.d/usr.lib.dovecot.deliver

deleted file mode 100644 (file)

index e00bf05..0000000
--- a/apparmor.d/usr.lib.dovecot.deliver
+++ /dev/null
@@ -1,37 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2009 Dulmandakh Sukhbaatar <dulmandakh@gmail.com>
-#    Copyright (C) 2009-2014 Canonical Ltd.
-#    Copyright (C) 2011-2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-#include <tunables/dovecot>
-
-/usr/lib/dovecot/deliver flags=(complain) {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/dovecot-common>
-
-  capability setuid,
-
-  @{DOVECOT_MAILSTORE}/ rw,
-  @{DOVECOT_MAILSTORE}/** rwkl,
-
-  # http://www.postfix.org/SASL_README.html#server_dovecot
-  /etc/dovecot/dovecot.conf r,
-  /etc/dovecot/{auth,conf}.d/*.conf r,
-  /etc/dovecot/dovecot-postfix.conf r, # ???
-
-  @{HOME} r, # ???
-  /usr/lib/dovecot/deliver mr,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.deliver>
-}
diff --git a/apparmor.d/usr.lib.dovecot.dict b/apparmor.d/usr.lib.dovecot.dict

deleted file mode 100644 (file)

index 4144604..0000000
--- a/apparmor.d/usr.lib.dovecot.dict
+++ /dev/null
@@ -1,31 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-
-/usr/lib/dovecot/dict flags=(complain) {
-  #include <abstractions/base>
-  #include <abstractions/mysql>
-  #include <abstractions/nameservice>
-  #include <abstractions/openssl>
-  #include <abstractions/dovecot-common>
-
-  capability setuid,
-
-  network inet stream,
-
-  /etc/dovecot/dovecot-database.conf.ext r,
-  /etc/dovecot/dovecot-dict-sql.conf.ext r,
-  /usr/lib/dovecot/dict mr,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.dict>
-}
diff --git a/apparmor.d/usr.lib.dovecot.dovecot-auth b/apparmor.d/usr.lib.dovecot.dovecot-auth

deleted file mode 100644 (file)

index 103e47a..0000000
--- a/apparmor.d/usr.lib.dovecot.dovecot-auth
+++ /dev/null
@@ -1,33 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2009-2013 Canonical Ltd.
-#    Copyright (C) 2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-
-/usr/lib/dovecot/dovecot-auth flags=(complain) {
-  #include <abstractions/authentication>
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/wutmp>
-  #include <abstractions/dovecot-common>
-
-  capability chown,
-  capability dac_override,
-
-  @{PROC}/@{pid}/mounts r,
-  /usr/lib/dovecot/dovecot-auth mr,
-  /{,var/}run/dovecot/** rw,
-  # required for postfix+dovecot integration
-  /var/spool/postfix/private/dovecot-auth w,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.dovecot-auth>
-}
diff --git a/apparmor.d/usr.lib.dovecot.dovecot-lda b/apparmor.d/usr.lib.dovecot.dovecot-lda

deleted file mode 100644 (file)

index 56e62f0..0000000
--- a/apparmor.d/usr.lib.dovecot.dovecot-lda
+++ /dev/null
@@ -1,91 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2013-2016 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-#include <tunables/dovecot>
-
-/usr/lib/dovecot/dovecot-lda flags=(complain,attach_disconnected) {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/dovecot-common>
-
-  capability setuid,
-
-  @{DOVECOT_MAILSTORE}/ rw,
-  @{DOVECOT_MAILSTORE}/** rwkl,
-
-  /etc/dovecot/** r,
-  /proc/*/mounts r,
-  owner /tmp/dovecot.lda.* rw,
-  /{var/,}run/dovecot/mounts r,
-  /run/dovecot/auth-userdb rw,
-  /usr/bin/doveconf mrix,
-  /usr/lib/dovecot/dovecot-lda mrix,
-  /usr/sbin/sendmail Cx,
-  /usr/share/dovecot/protocols.d/ r,
-  /usr/share/dovecot/protocols.d/** r,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.dovecot-lda>
-
-
-  profile /usr/sbin/sendmail flags=(complain,attach_disconnected) {
-    # this profile is based on the usr.sbin.sendmail profile in extras
-    # and should support both postfix' and sendmail's sendmail binary
-
-    #include <abstractions/base>
-    #include <abstractions/consoles>
-    #include <abstractions/nameservice>
-    #include <abstractions/user-tmp>
-    #include <abstractions/postfix-common>
-
-    capability sys_ptrace,
-
-    /etc/aliases rw,     # newaliases is a symlink to sendmail, so it's
-    /etc/aliases.db rw,  # actually the same binary
-    /etc/fstab r,
-    /etc/hosts.allow r,
-    /etc/hosts.deny r,
-    /etc/mail/* r,
-    /etc/mail/statistics rw,
-    /etc/mtab r,
-    /etc/postfix/aliases r,
-    /etc/postfix/aliases.db rw,  # newaliases again
-    /etc/sendmail.cf r,
-    /etc/sendmail.cw r,
-    /etc/shells r,
-    /proc/loadavg r,
-    /proc/net/if_inet6 r,
-    /root/.forward r,
-    /root/dead.letter w,
-    /usr/bin/procmail Px,
-    /usr/lib/postfix/master Px,
-    /usr/lib/postfix/showq Px,
-    /usr/lib/postfix/smtpd Px,
-    /usr/sbin/postalias Px,
-    /usr/sbin/postdrop Px,
-    /usr/sbin/postfix Px,
-    /usr/sbin/postqueue Px,
-    /usr/sbin/sendmail mrix,
-    /usr/sbin/sendmail.postfix mrix,
-    /usr/sbin/sendmail.sendmail mrix,
-    /{var/,}run/sendmail.pid rwl,
-    /{var/,}run/sm-client.pid rwl,
-    /{var/,}run/utmp rw,
-    /var/spool/clientmqueue/* rwl,
-    /var/spool/mail/* rwl,
-    /var/spool/mqueue/* rwl,
-    /var/spool/postfix/maildrop/* rwl,
-    /var/spool/postfix/public/pickup w,
-    /var/spool/postfix/public/qmgr w,
-    /var/spool/postfix/public/showq w,
-  }
-}
diff --git a/apparmor.d/usr.lib.dovecot.imap b/apparmor.d/usr.lib.dovecot.imap

deleted file mode 100644 (file)

index 21b346e..0000000
--- a/apparmor.d/usr.lib.dovecot.imap
+++ /dev/null
@@ -1,46 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2009-2010 Canonical Ltd.
-#    Copyright (C) 2011-2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-#include <tunables/dovecot>
-
-/usr/lib/dovecot/imap flags=(complain) {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/dovecot-common>
-
-  capability setuid,
-  deny capability block_suspend,
-
-  network unix stream,
-
-  @{DOVECOT_MAILSTORE}/ rw,
-  @{DOVECOT_MAILSTORE}/** rwkl,
-
-  @{HOME} r, # ???
-
-  /etc/dovecot/dovecot.conf r,
-  /etc/dovecot/conf.d/ r,
-  /etc/dovecot/conf.d/** r,
-
-  owner /tmp/dovecot.imap.* rw,
-
-  /usr/bin/doveconf rix,
-  /usr/lib/dovecot/imap mrix,
-  /usr/share/dovecot/** r,
-  /run/dovecot/login/imap rw,
-  /{,var/}run/dovecot/auth-master rw,
-  /{,var/}run/dovecot/mounts r,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.imap>
-}
diff --git a/apparmor.d/usr.lib.dovecot.imap-login b/apparmor.d/usr.lib.dovecot.imap-login

deleted file mode 100644 (file)

index 57e2f8e..0000000
--- a/apparmor.d/usr.lib.dovecot.imap-login
+++ /dev/null
@@ -1,35 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2009-2011 Canonical Ltd.
-#    Copyright (C) 2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-/usr/lib/dovecot/imap-login flags=(complain) {
-  #include <abstractions/base>
-  #include <abstractions/ssl_certs>
-  #include <abstractions/ssl_keys>
-  #include <abstractions/dovecot-common>
-
-  capability setuid,
-  capability sys_chroot,
-
-  network inet stream,
-  network inet6 stream,
-  network unix stream,
-
-  /usr/lib/dovecot/imap-login mr,
-  /{,var/}run/dovecot/anvil rw,
-  /{,var/}run/dovecot/login-master-notify* rw,
-  /{,var/}run/dovecot/login/ r,
-  /{,var/}run/dovecot/login/* rw,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.imap-login>
-}
diff --git a/apparmor.d/usr.lib.dovecot.lmtp b/apparmor.d/usr.lib.dovecot.lmtp

deleted file mode 100644 (file)

index e15b97a..0000000
--- a/apparmor.d/usr.lib.dovecot.lmtp
+++ /dev/null
@@ -1,38 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-#include <tunables/dovecot>
-
-/usr/lib/dovecot/lmtp flags=(complain) {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/dovecot-common>
-  #include <abstractions/openssl>
-  #include <abstractions/ssl_keys>
-
-  capability dac_override,
-  capability dac_read_search,
-  capability setuid,
-
-  @{DOVECOT_MAILSTORE}/ rw,
-  @{DOVECOT_MAILSTORE}/** rwkl,
-
-  @{HOME}/.dovecot.svbin r,
-
-  /proc/*/mounts r,
-  /tmp/dovecot.lmtp.* rw,
-  /usr/lib/dovecot/lmtp mr,
-  /{var/,}run/dovecot/mounts r,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.lmtp>
-}
diff --git a/apparmor.d/usr.lib.dovecot.log b/apparmor.d/usr.lib.dovecot.log

deleted file mode 100644 (file)

index 6d1b77d..0000000
--- a/apparmor.d/usr.lib.dovecot.log
+++ /dev/null
@@ -1,22 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-
-/usr/lib/dovecot/log flags=(complain,attach_disconnected) {
-  #include <abstractions/base>
-  #include <abstractions/dovecot-common>
-
-  /usr/lib/dovecot/log mr,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.log>
-}
diff --git a/apparmor.d/usr.lib.dovecot.managesieve b/apparmor.d/usr.lib.dovecot.managesieve

deleted file mode 100644 (file)

index cc30985..0000000
--- a/apparmor.d/usr.lib.dovecot.managesieve
+++ /dev/null
@@ -1,34 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2013 Christian Boltz
-#    Copyright (C) 2014 Christian Wittmer
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-#include <tunables/dovecot>
-
-/usr/lib/dovecot/managesieve flags=(complain) {
-  #include <abstractions/base>
-  #include <abstractions/dovecot-common>
-
-  capability setuid,
-
-  network inet stream,
-  network inet6 stream,
-
-  @{DOVECOT_MAILSTORE}/ rw,
-  @{DOVECOT_MAILSTORE}/** rwkl,
-
-  /etc/dovecot/** r,
-  /usr/bin/doveconf rix,
-  /usr/lib/dovecot/managesieve mrix,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.managesieve>
-}
diff --git a/apparmor.d/usr.lib.dovecot.managesieve-login b/apparmor.d/usr.lib.dovecot.managesieve-login

deleted file mode 100644 (file)

index fcdf5d8..0000000
--- a/apparmor.d/usr.lib.dovecot.managesieve-login
+++ /dev/null
@@ -1,36 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (c) 2009 Dulmandakh Sukhbaatar <dulmandakh@gmail.com>
-#    Copyright (C) 2009-2011 Canonical Ltd.
-#    Copyright (C) 2013 Christian Boltz
-#    Copyright (C) 2014 Christian Wittmer
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-
-/usr/lib/dovecot/managesieve-login flags=(complain) {
-  #include <abstractions/base>
-  #include <abstractions/ssl_certs>
-  #include <abstractions/ssl_keys>
-  #include <abstractions/dovecot-common>
-
-  capability setuid,
-  capability sys_chroot,
-
-  network inet stream,
-  network inet6 stream,
-
-  /usr/lib/dovecot/managesieve-login mr,
-  /{,var/}run/dovecot/login-master-notify* rw,
-  /{,var/}run/dovecot/login/ r,
-  /{,var/}run/dovecot/login/* rw,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.managesieve-login>
-}
diff --git a/apparmor.d/usr.lib.dovecot.pop3 b/apparmor.d/usr.lib.dovecot.pop3

deleted file mode 100644 (file)

index 17a0282..0000000
--- a/apparmor.d/usr.lib.dovecot.pop3
+++ /dev/null
@@ -1,31 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2009-2010 Canonical Ltd.
-#    Copyright (C) 2011-2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-#include <tunables/dovecot>
-
-/usr/lib/dovecot/pop3 flags=(complain) {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/dovecot-common>
-
-  capability setuid,
-
-  @{DOVECOT_MAILSTORE}/ rw,
-  @{DOVECOT_MAILSTORE}/** rwkl,
-
-  @{HOME} r, # ???
-  /usr/lib/dovecot/pop3 mr,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.pop3>
-}
diff --git a/apparmor.d/usr.lib.dovecot.pop3-login b/apparmor.d/usr.lib.dovecot.pop3-login

deleted file mode 100644 (file)

index 71d54f6..0000000
--- a/apparmor.d/usr.lib.dovecot.pop3-login
+++ /dev/null
@@ -1,32 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2009-2011 Canonical Ltd.
-#    Copyright (C) 2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-
-/usr/lib/dovecot/pop3-login flags=(complain) {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/ssl_certs>
-  #include <abstractions/ssl_keys>
-  #include <abstractions/dovecot-common>
-
-  capability setuid,
-  capability sys_chroot,
-
-  /usr/lib/dovecot/pop3-login mr,
-  /{,var/}run/dovecot/anvil rw,
-  /{,var/}run/dovecot/login/ r,
-  /{,var/}run/dovecot/login/* rw,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.pop3-login>
-}
diff --git a/apparmor.d/usr.lib.dovecot.ssl-params b/apparmor.d/usr.lib.dovecot.ssl-params

deleted file mode 100644 (file)

index 1333813..0000000
--- a/apparmor.d/usr.lib.dovecot.ssl-params
+++ /dev/null
@@ -1,25 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-
-/usr/lib/dovecot/ssl-params flags=(complain) {
-  #include <abstractions/base>
-  #include <abstractions/dovecot-common>
-
-  /run/dovecot/login/ssl-params rw,
-  /usr/lib/dovecot/ssl-params mr,
-  /var/lib/dovecot/ssl-parameters.dat rw,
-  /var/lib/dovecot/ssl-parameters.dat.tmp rwk,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.lib.dovecot.ssl-params>
-}
diff --git a/apparmor.d/usr.sbin.avahi-daemon b/apparmor.d/usr.sbin.avahi-daemon

index 6ef625d6a7d2e21d00aa67de72a2636a093f7ad5..62f56df7810505a00753fca88de1d042b8ce778f 100644 (file)
--- a/apparmor.d/usr.sbin.avahi-daemon
+++ b/apparmor.d/usr.sbin.avahi-daemon
@@ -1,5 +1,5 @@
  #include <tunables/global>
-/usr/sbin/avahi-daemon flags=(complain) {
+profile avahi-daemon /usr/{bin,sbin}/avahi-daemon flags=(complain) {
    #include <abstractions/base>
    #include <abstractions/consoles>
    #include <abstractions/dbus>
@@ -20,7 +20,7 @@
    /etc/avahi/services/ r,
    /etc/avahi/services/*.service r,
    @{PROC}/@{pid}/fd/ r,
-  /usr/sbin/avahi-daemon mr,
+  /usr/{bin,sbin}/avahi-daemon mr,
    /usr/share/avahi/introspection/*.introspect r,
    /usr/share/dbus-1/interfaces/org.freedesktop.Avahi.*.xml r,
    /{,var/}run/avahi-daemon/ w,
diff --git a/apparmor.d/usr.sbin.dnsmasq b/apparmor.d/usr.sbin.dnsmasq

index da0a7608acc2f45fd52583d3aae9582e753f409e..1fb0ba2fae23d24c825632cddcf6ea220be8e56b 100644 (file)
--- a/apparmor.d/usr.sbin.dnsmasq
+++ b/apparmor.d/usr.sbin.dnsmasq
@@ -12,7 +12,13 @@
  @{TFTP_DIR}=/var/tftp /srv/tftpboot
  
  #include <tunables/global>
-/usr/sbin/dnsmasq flags=(complain,attach_disconnected) {
+
+# This profile has the name "/usr/sbin/dnsmasq", but attaches to both /usr/bin/dnsmasq and /usr/sbin/dnsmasq.
+# We are sorry for the confusion ;-) but this trick is needed to support distributions with merged bin and sbin
+# while not breaking the libvirtd profile that has rules with peer=/usr/sbin/dnsmasq
+# Future versions of AppArmor (> 2.13.x) will have "dnsmasq" as profile name.
+
+profile /usr/sbin/dnsmasq /usr/{bin,sbin}/dnsmasq flags=(complain,attach_disconnected) {
    #include <abstractions/base>
    #include <abstractions/dbus>
    #include <abstractions/nameservice>
@@ -27,8 +33,12 @@
    network inet raw,
    network inet6 raw,
  
+  signal (receive) peer=/usr/{bin,sbin}/libvirtd,
    signal (receive) peer=/usr/sbin/libvirtd,
+  signal (receive) peer=libvirtd,
+  ptrace (readby) peer=/usr/{bin,sbin}/libvirtd,
    ptrace (readby) peer=/usr/sbin/libvirtd,
+  ptrace (readby) peer=libvirtd,
  
    owner /dev/tty rw,
  
@@ -40,8 +50,15 @@
    /etc/ethers r,
    /etc/NetworkManager/dnsmasq.d/ r,
    /etc/NetworkManager/dnsmasq.d/* r,
+  /etc/NetworkManager/dnsmasq-shared.d/ r,
+  /etc/NetworkManager/dnsmasq-shared.d/* r,
+
+  /usr/{bin,sbin}/dnsmasq mr,
+
+  /var/log/dnsmasq*.log w,
  
-  /usr/sbin/dnsmasq mr,
+  /usr/share/dnsmasq/ r,
+  /usr/share/dnsmasq/* r,
  
    /{,var/}run/*dnsmasq*.pid w,
    /{,var/}run/dnsmasq-forwarders.conf r,
@@ -83,10 +100,13 @@
    /var/lib/lxd/networks/*/dnsmasq.pid rw,
  
    # NetworkManager integration
+  /var/lib/NetworkManager/dnsmasq-*.leases rw,
    /{,var/}run/nm-dns-dnsmasq.conf r,
+  /{,var/}run/nm-dnsmasq-*.pid rw,
    /{,var/}run/sendsigs.omit.d/*dnsmasq.pid w,
    /{,var/}run/NetworkManager/dnsmasq.conf r,
    /{,var/}run/NetworkManager/dnsmasq.pid w,
+  /{,var/}run/NetworkManager/NetworkManager.pid w,
  
    profile libvirt_leaseshelper flags=(complain) {
      #include <abstractions/base>
@@ -98,9 +118,9 @@
      owner @{PROC}/@{pid}/net/psched r,
      owner @{PROC}/@{pid}/status r,
  
-    /sys/devices/system/cpu/ r,
-    /sys/devices/system/node/ r,
-    /sys/devices/system/node/*/meminfo r,
+    @{sys}/devices/system/cpu/ r,
+    @{sys}/devices/system/node/ r,
+    @{sys}/devices/system/node/*/meminfo r,
  
      # libvirt lease and status files for dnsmasq
      /var/lib/libvirt/dnsmasq/*.leases  rw,
diff --git a/apparmor.d/usr.sbin.dovecot b/apparmor.d/usr.sbin.dovecot

deleted file mode 100644 (file)

index 467e9e5..0000000
--- a/apparmor.d/usr.sbin.dovecot
+++ /dev/null
@@ -1,70 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2009-2013 Canonical Ltd.
-#    Copyright (C) 2011-2013 Christian Boltz
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-# vim: ft=apparmor
-
-#include <tunables/global>
-
-/usr/sbin/dovecot flags=(complain,attach_disconnected) {
-  #include <abstractions/authentication>
-  #include <abstractions/base>
-  #include <abstractions/dovecot-common>
-  #include <abstractions/mysql>
-  #include <abstractions/nameservice>
-  #include <abstractions/ssl_certs>
-  #include <abstractions/ssl_keys>
-
-  capability chown,
-  capability dac_override,
-  capability dac_read_search,
-  capability fsetid,
-  capability kill,
-  capability net_bind_service,
-  capability setuid,
-  capability sys_chroot,
-  capability sys_resource,
-
-  signal send set=(int,quit) peer=/usr/lib/dovecot/*,
-
-  /etc/dovecot/** r,
-  /etc/mtab r,
-  /etc/lsb-release r,
-  /etc/SuSE-release r,
-  @{PROC}/@{pid}/mounts r,
-  /usr/bin/doveconf rix,
-  /usr/lib/dovecot/anvil mrPx,
-  /usr/lib/dovecot/auth mrPx,
-  /usr/lib/dovecot/config mrPx,
-  /usr/lib/dovecot/dict mrPx,
-  /usr/lib/dovecot/dovecot-auth Pxmr,
-  /usr/lib/dovecot/imap Pxmr,
-  /usr/lib/dovecot/imap-login Pxmr,
-  /usr/lib/dovecot/lmtp mrPx,
-  /usr/lib/dovecot/log mrPx,
-  /usr/lib/dovecot/managesieve mrPx,
-  /usr/lib/dovecot/managesieve-login Pxmr,
-  /usr/lib/dovecot/pop3 mrPx,
-  /usr/lib/dovecot/pop3-login Pxmr,
-  /usr/lib/dovecot/ssl-build-param rix,
-  /usr/lib/dovecot/ssl-params mrPx,
-  /usr/sbin/dovecot mrix,
-  /usr/share/dovecot/protocols.d/   r,
-  /usr/share/dovecot/protocols.d/** r,
-  /var/lib/dovecot/ w,
-  /var/lib/dovecot/* rwkl,
-  /var/spool/postfix/private/auth w,
-  /var/spool/postfix/private/dovecot-lmtp w,
-  /{,var/}run/dovecot/ rw,
-  /{,var/}run/dovecot/** rw,
-  link /{,var/}run/dovecot/** -> /var/lib/dovecot/**,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.sbin.dovecot>
-}
diff --git a/apparmor.d/usr.sbin.identd b/apparmor.d/usr.sbin.identd

index e0e8d7d47c891157843307207a0ae9d5be0e4b82..08d751e9127e0fbf36e0188968f0d82da0029926 100644 (file)
--- a/apparmor.d/usr.sbin.identd
+++ b/apparmor.d/usr.sbin.identd
@@ -11,16 +11,17 @@
  
  #include <tunables/global>
  
-/usr/sbin/identd flags=(complain) {
+profile identd /usr/{bin,sbin}/identd flags=(complain) {
    #include <abstractions/base>
    #include <abstractions/nameservice>
    capability net_bind_service,
    capability setgid,
    capability setuid,
+  network netlink dgram,
    /etc/identd.conf         r,
    /etc/identd.key          r,
    /etc/identd.pid          w,
-  /usr/sbin/identd        rmix,
+  /usr/{bin,sbin}/identd   rmix,
    @{PROC}/net/tcp          r,
    @{PROC}/net/tcp6         r,
    /{,var/}run/identd.pid   w,
diff --git a/apparmor.d/usr.sbin.ippusbxd b/apparmor.d/usr.sbin.ippusbxd

index d017dbfe012659066e493d34391ba7f3fa307f41..bfeddf7a4aa90db07e17108246edd39e79374a68 100644 (file)
--- a/apparmor.d/usr.sbin.ippusbxd
+++ b/apparmor.d/usr.sbin.ippusbxd
@@ -4,13 +4,13 @@
  
  #include <tunables/global>
  
-/usr/sbin/ippusbxd {
+profile ippusbxd /usr/{bin,sbin}/ippusbxd {
    #include <abstractions/base>
    #include <abstractions/dbus>
  
    capability wake_alarm,
  
-  /usr/sbin/ippusbxd mr,
+  /usr/{bin,sbin}/ippusbxd mr,
  
    # Scanning for USB devices
    /dev/bus/usb/ r,
diff --git a/apparmor.d/usr.sbin.mdnsd b/apparmor.d/usr.sbin.mdnsd

index 44d2146fca659710698e85c3683dd86361dacabf..82b4088ea9e666887ecf03cc198146411fcca682 100644 (file)
--- a/apparmor.d/usr.sbin.mdnsd
+++ b/apparmor.d/usr.sbin.mdnsd
@@ -11,7 +11,7 @@
  
  #include <tunables/global>
  
-/usr/sbin/mdnsd flags=(complain) {
+profile mdnsd /usr/{bin,sbin}/mdnsd flags=(complain) {
    #include <abstractions/base>
    #include <abstractions/consoles>
    #include <abstractions/nameservice>
@@ -24,7 +24,7 @@
  
    network netlink dgram,
  
-  /usr/sbin/mdnsd rmix,
+  /usr/{bin,sbin}/mdnsd rmix,
  
    @{PROC}/net/ r,
    @{PROC}/net/unix r,
diff --git a/apparmor.d/usr.sbin.nmbd b/apparmor.d/usr.sbin.nmbd

index a54c1f798affa70b24665c439e6b1ac0f8c971ca..e0e9cd0ce8be967dcc275ffc2ad5a9bdf5b62c78 100644 (file)
--- a/apparmor.d/usr.sbin.nmbd
+++ b/apparmor.d/usr.sbin.nmbd
@@ -1,6 +1,6 @@
  #include <tunables/global>
  
-/usr/sbin/nmbd flags=(complain) {
+profile nmbd /usr/{bin,sbin}/nmbd flags=(complain) {
    #include <abstractions/base>
    #include <abstractions/nameservice>
    #include <abstractions/samba>
@@ -9,9 +9,11 @@
  
    @{PROC}/sys/kernel/core_pattern r,
  
-  /usr/sbin/nmbd mr,
+  /usr/{bin,sbin}/nmbd mr,
  
    /var/cache/samba/gencache.tdb rwk,
+  /var/cache/samba/gencache_notrans.tdb rwk,
+  /var/cache/samba/names.tdb rwk,
    /var/{cache,lib}/samba/browse.dat* rw,
    /var/{cache,lib}/samba/gencache.dat rw,
    /var/{cache,lib}/samba/wins.dat* rw,
@@ -22,8 +24,11 @@
    /var/{cache,lib}/samba/unexpected rw,
    /var/cache/samba/msg/ rw,
    /var/cache/samba/msg/* w,
+  /var/cache/samba/msg.lock/{,*} rwk,
  
+  /{,var/}run/nmbd.pid rwk,
    /{,var/}run/samba/** rwk,
+  /{,var/}run/systemd/notify w,
  
    # Site-specific additions and overrides. See local/README for details.
    #include <local/usr.sbin.nmbd>
diff --git a/apparmor.d/usr.sbin.nscd b/apparmor.d/usr.sbin.nscd

index 2eeee5013d6fef76f4be5b1f1157e9aaf494c075..b1b1b95351393eaa53b32c8b83943f4ff0df2e2a 100644 (file)
--- a/apparmor.d/usr.sbin.nscd
+++ b/apparmor.d/usr.sbin.nscd
@@ -10,7 +10,7 @@
  # ------------------------------------------------------------------
  
  #include <tunables/global>
-/usr/sbin/nscd flags=(complain) {
+profile nscd /usr/{bin,sbin}/nscd flags=(complain) {
    #include <abstractions/base>
    #include <abstractions/consoles>
    #include <abstractions/nameservice>
@@ -23,7 +23,7 @@
  
    /etc/netgroup r,
    /etc/nscd.conf r,
-  /usr/sbin/nscd rmix,
+  /usr/{bin,sbin}/nscd rmix,
    /{,var/}run/.nscd_socket wl,
    /{,var/}run/nscd/ rw,
    /{,var/}run/nscd/db* rwl,
diff --git a/apparmor.d/usr.sbin.rsyslogd b/apparmor.d/usr.sbin.rsyslogd

index d9b502ad13f19b8fdce7b1bf96b1fe390ee35af4..3e74588c8b452e57c880033d7cb4b740447aee55 100644 (file)
--- a/apparmor.d/usr.sbin.rsyslogd
+++ b/apparmor.d/usr.sbin.rsyslogd
@@ -29,6 +29,7 @@
    /var/spool/rsyslog/ r,
    /var/spool/rsyslog/** rwk,
  
+  /usr/sbin/rsyslogd mr,
    /usr/lib{,32,64}/{,@{multiarch}/}rsyslog/*.so mr,
  
    /dev/tty*                     rw,
diff --git a/apparmor.d/usr.sbin.smbd b/apparmor.d/usr.sbin.smbd

index 33662d3b062e1c1576e4b80efeaf4119dc80e3c3..7d8b68a9fb19c693cd0c40f8577cf8bb4573e76d 100644 (file)
--- a/apparmor.d/usr.sbin.smbd
+++ b/apparmor.d/usr.sbin.smbd
@@ -1,6 +1,6 @@
  #include <tunables/global>
  
-/usr/sbin/smbd flags=(complain) {
+profile smbd /usr/{bin,sbin}/smbd flags=(complain) {
    #include <abstractions/authentication>
    #include <abstractions/base>
    #include <abstractions/consoles>
@@ -29,20 +29,22 @@
    @{PROC}/@{pid}/mounts r,
    @{PROC}/sys/kernel/core_pattern r,
    /usr/lib*/samba/vfs/*.so mr,
+  /usr/lib*/samba/auth/*.so mr,
    /usr/lib*/samba/charset/*.so mr,
-  /usr/lib*/samba/auth/script.so mr,
+  /usr/lib*/samba/gensec/*.so mr,
    /usr/lib*/samba/pdb/*.so mr,
    /usr/lib*/samba/{lowcase,upcase,valid}.dat r,
    /usr/lib/@{multiarch}/samba/*.so{,.[0-9]*} mr,
    /usr/lib/@{multiarch}/samba/**/ r,
    /usr/lib/@{multiarch}/samba/**/*.so{,.[0-9]*} mr,
-  /usr/sbin/smbd mr,
-  /usr/sbin/smbldap-useradd Px,
+  /usr/{bin,sbin}/smbd mr,
+  /usr/{bin,sbin}/smbldap-useradd Px,
    /var/cache/samba/** rwk,
    /var/{cache,lib}/samba/printing/printers.tdb mrw,
    /var/lib/samba/** rwk,
    /var/lib/sss/pubconf/kdcinfo.* r,
    /{,var/}run/dbus/system_bus_socket rw,
+  /{,var/}run/smbd.pid rwk,
    /{,var/}run/samba/** rk,
    /{,var/}run/samba/ncalrpc/ rw,
    /{,var/}run/samba/ncalrpc/** rw,
@@ -53,6 +55,10 @@
  
    @{HOMEDIRS}/** lrwk,
  
+  # Permissions for all configured shares (file autogenerated by
+  # update-apparmor-samba-profile on service startup.
+  #include if exists <samba/smbd-shares>
+
    # Site-specific additions and overrides. See local/README for details.
    #include <local/usr.sbin.smbd>
  }
diff --git a/apparmor.d/usr.sbin.smbldap-useradd b/apparmor.d/usr.sbin.smbldap-useradd

index 497f8ad105b268b6ca2e873ae13f7c92e1b3ea06..d52307a7e738c9f2a7bb5282bc57d455964b0bf4 100644 (file)
--- a/apparmor.d/usr.sbin.smbldap-useradd
+++ b/apparmor.d/usr.sbin.smbldap-useradd
@@ -1,7 +1,7 @@
  # Last Modified: Tue Jan  3 00:17:40 2012
  #include <tunables/global>
  
-/usr/sbin/smbldap-useradd flags=(complain) {
+profile smbldap-useradd /usr/{bin,sbin}/smbldap-useradd flags=(complain) {
    #include <abstractions/base>
    #include <abstractions/bash>
    #include <abstractions/nameservice>
@@ -13,8 +13,8 @@
    /etc/shadow r,
    /etc/smbldap-tools/smbldap.conf r,
    /etc/smbldap-tools/smbldap_bind.conf r,
-  /usr/sbin/smbldap-useradd r,
-  /usr/sbin/smbldap_tools.pm r,
+  /usr/{bin,sbin}/smbldap-useradd r,
+  /usr/{bin,sbin}/smbldap_tools.pm r,
    /var/log/samba/log.smbd w,
  
    # Site-specific additions and overrides. See local/README for details.
diff --git a/apparmor.d/usr.sbin.tcpdump b/apparmor.d/usr.sbin.tcpdump

index 7a7da4f954f66a035af8ebbb8954c23075442f2f..d0a7037a3ce8929018938245cd043679ebd84b7f 100644 (file)
--- a/apparmor.d/usr.sbin.tcpdump
+++ b/apparmor.d/usr.sbin.tcpdump
@@ -10,6 +10,7 @@
    capability setuid,
    capability setgid,
    capability dac_override,
+  capability chown,
    network raw,
    network packet,
  
@@ -18,10 +19,11 @@
    @{PROC}/bus/usb/** r,
  
    # for finding an interface
+  /dev/ r,
    @{PROC}/[0-9]*/net/dev r,
    /sys/bus/usb/devices/ r,
    /sys/class/net/ r,
-  /sys/devices/**/net/* r,
+  /sys/devices/**/net/** r,
  
    # for -j
    capability net_admin,
diff --git a/apparmor.d/usr.sbin.traceroute b/apparmor.d/usr.sbin.traceroute

index 251c72b050c7955aab3693d80236dca6abdbfa1a..c5cb3b8fdbc4332db861b15ad7a257557aa2f4fc 100644 (file)
--- a/apparmor.d/usr.sbin.traceroute
+++ b/apparmor.d/usr.sbin.traceroute
@@ -10,7 +10,7 @@
  # ------------------------------------------------------------------
  
  #include <tunables/global>
-/usr/{sbin/traceroute,bin/traceroute.db} flags=(complain) {
+profile traceroute /usr/{{bin,sbin}/traceroute,bin/linux-traceroute,bin/traceroute.db} flags=(complain) {
    #include <abstractions/base>
    #include <abstractions/consoles>
    #include <abstractions/nameservice>
@@ -21,8 +21,7 @@
    network inet raw,
    network inet6 raw,
  
-  /usr/sbin/traceroute mrix,
-  /usr/bin/traceroute.db mrix,
+  /usr/{{bin,sbin}/traceroute,bin/linux-traceroute,bin/traceroute.db} mrix,
    @{PROC}/net/route r,
    @{PROC}/sys/net/ipv4/{tcp_ecn,tcp_sack,tcp_timestamps,tcp_window_scaling} r,
  
diff --git a/apparmor/parser.conf b/apparmor/parser.conf

index 8db26269cefa7a3c8d5e14395e85fa358904f8b9..641cf1db8071170958f6247f39d6440c02af4f6d 100644 (file)
--- a/apparmor/parser.conf
+++ b/apparmor/parser.conf
@@ -21,7 +21,6 @@
  #Include /etc/apparmor.d/
  # or
  #Include /usr/share/apparmor
-Include /usr/share/apparmor
  
  
  ## Set location of apparmor filesystem
diff --git a/apparmor/subdomain.conf b/apparmor/subdomain.conf

deleted file mode 100644 (file)

index 20e7cab..0000000
--- a/apparmor/subdomain.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-# subdomain.conf is a shared AppArmor configuration file that is sh sourcable.
-
-################## AppArmor init.d configuration ################
-
-# Move this to /etc/sysconfig/apparmor eventually
-## Path:       System/AppArmor
-## Description: Enable the OWLSM extension to AppArmor
-## Type:       yesno
-## Default:    no
-#
-# Enable OWLSM extension to AppArmor?
-# OWLSM is an extension to AppArmor that prevents processes from
-# following symlinks they don't own and creating hardlinks to files they
-# don't own, in an attempt to prevent /tmp race attacks. However, OWLSM
-# can break some applications, so is disabled by default.
-SUBDOMAIN_ENABLE_OWLSM="no"
-
-## Path:       System/AppArmor
-## Description: Enable the AppArmor event daemon for reporting
-## Type:       yesno
-## Default:    no
-#
-# Enable the AppArmor event daemon for reporting?
-APPARMOR_ENABLE_AAEVENTD="no"
-
-#SUBDOMAIN_MODULE_PANIC=XXX
-#This option controls how subdomain behaves when the init script attempts
-#to load the AppArmor module and fails.  There are 4 options
-#warn  - log a failure message. (default behavior)
-#build - attempt to build the AppArmor module is the module can't be loaded.
-#        If successful
-#           the module will be built for the running kernel and loaded.
-#        If the build fails
-#           a failure message is logged
-#panic - If the AppArmor module fails to load
-#           a failure message will be logged
-#           and the machine will drop to runlevel 1 (single user)
-#build-panic - If the AppArmor module fails to load
-#                 attempt to build the module
-#                 If building the module fails
-#                    panic (drop to runlevel 1)  
-
-#SUBDOMAIN_MODULE_PANIC=warn
-
-################## subdomain_parser configuration ################
-
-#SUBDOMAIN_PATH=XXXX
-#This option specifies the include path that the subdomain_parser will
-#use by default.  If no entry is specified /etc/subdomain.d is used by
-#default.
-
-#SUBDOMAIN_PATH=/etc/subdomain.d
-
diff --git a/apt/preferences.d/nosnap.pref b/apt/preferences.d/nosnap.pref

new file mode 100644 (file)

index 0000000..6c5a93b
--- /dev/null
+++ b/apt/preferences.d/nosnap.pref
@@ -0,0 +1,7 @@
+# To prevent repository packages from triggering the installation of Snap,
+# this file forbids snapd from being installed by APT.
+# For more information: https://linuxmint-user-guide.readthedocs.io/en/latest/snap.html
+
+Package: snapd
+Pin: release a=*
+Pin-Priority: -10
diff --git a/console-setup/Uni2-Fixed16.psf.gz b/console-setup/Uni2-Fixed16.psf.gz

index 52c26d4e6dc09ed8053b89d4ae8bc437dbbd36b6..37eb6549a069e3ac743378f24abac3ea0d6f36d2 100644 (file)

Binary files a/console-setup/Uni2-Fixed16.psf.gz and b/console-setup/Uni2-Fixed16.psf.gz differ
diff --git a/console-setup/cached_UTF-8_del.kmap.gz b/console-setup/cached_UTF-8_del.kmap.gz

index ec0da32d9af77f6feb087cc8bcf3c3cf5bd05b32..470fa7f447ae99179c19b7816d7352abbbe9fdd5 100644 (file)

Binary files a/console-setup/cached_UTF-8_del.kmap.gz and b/console-setup/cached_UTF-8_del.kmap.gz differ
diff --git a/console-setup/cached_Uni2-Fixed16.psf.gz b/console-setup/cached_Uni2-Fixed16.psf.gz

index 52c26d4e6dc09ed8053b89d4ae8bc437dbbd36b6..37eb6549a069e3ac743378f24abac3ea0d6f36d2 100644 (file)

Binary files a/console-setup/cached_Uni2-Fixed16.psf.gz and b/console-setup/cached_Uni2-Fixed16.psf.gz differ
diff --git a/console-setup/cached_setup_font.sh b/console-setup/cached_setup_font.sh

index b11959cc1a01049550455c24fa917cce2492200f..06f41b7017087c703196ea58d0c42381e49d2834 100755 (executable)
--- a/console-setup/cached_setup_font.sh
+++ b/console-setup/cached_setup_font.sh
@@ -1,11 +1,11 @@
  #!/bin/sh
  
-setfont '/etc/console-setup/Uni2-Fixed16.psf.gz' 
+setfont '/usr/share/consolefonts/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' 
+            setfont '/usr/share/consolefonts/Uni2-Fixed16.psf.gz' 
          } < /dev/tty${i#/dev/vcs} > /dev/tty${i#/dev/vcs}
      done
  fi
diff --git a/console-setup/cached_setup_keyboard.sh b/console-setup/cached_setup_keyboard.sh

index 30b46c1b76026e66d7564d5693b2e08af9ae421b..bae278fc38bcc9e2e4570c05f835bbf9af618eef 100755 (executable)
--- a/console-setup/cached_setup_keyboard.sh
+++ b/console-setup/cached_setup_keyboard.sh
@@ -10,4 +10,4 @@ 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' 
+loadkeys '/run/tmpkbd.T1L6ll' > '/dev/null' 
diff --git a/cowpoke.conf b/cowpoke.conf

index c11400ba06ab2f66f89bcec612e2bcbbd839c11e..85ae0a6881b25efe3bc6efed23f15fd2dc9a30af 100644 (file)
--- a/cowpoke.conf
+++ b/cowpoke.conf
@@ -129,5 +129,5 @@ BUILDD_HOST=
  #i386_experimental_BASE_PATH="$PBUILDER_BASE/i386/experimental/base.cow"
  
  #amd64_wheezy_bpo_BASE_DIST="wheezy"
-#amd64_wheezy_bpo_CREATE_OPTS=(--othermirror "deb http://ftp.debian.org/debian wheezy-backports main")
+#amd64_wheezy_bpo_CREATE_OPTS=(--othermirror "deb http://deb.debian.org/debian wheezy-backports main")
  
diff --git a/cracklib/cracklib.conf b/cracklib/cracklib.conf

index 82be232494d8ce64f6cc13372afc2ae864387060..533a5c405edeee9cf5818b53df2d2db5ec5b0a08 100644 (file)
--- a/cracklib/cracklib.conf
+++ b/cracklib/cracklib.conf
@@ -49,7 +49,7 @@
    do
      if [ -d $i ]
      then
-      for file in $(find $i -type f -print)
+      for file in $(find $i -type f -print | LC_ALL=C sort)
        do
          if $(file -z -b ${file} | grep -q "text")
          then
diff --git a/cron.d/anacron b/cron.d/anacron

index 505b5c7c6ed3222b7cbb90768b98cf0911b70e1a..ce75db88286bfa409c31f6fe94069d0fc629f96a 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   [ -x /etc/init.d/anacron ] && if [ ! -d /run/systemd/system ]; then /usr/sbin/invoke-rc.d anacron start >/dev/null; fi
+30 7-23 * * *   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.daily/logrotate b/cron.daily/logrotate

index 0f188645936e65c7fb4d6cbe7b0e5a780af0bffa..1ac1570016475f536d7e346115ed5076030f6c6f 100755 (executable)
--- a/cron.daily/logrotate
+++ b/cron.daily/logrotate
@@ -1,14 +1,18 @@
  #!/bin/sh
  
-# Clean non existent log file entries from status file
-cd /var/lib/logrotate
-test -e status || touch status
-head -1 status > status.clean
-sed 's/"//g' status | while read logfile date
-do
-    [ -e "$logfile" ] && echo "\"$logfile\" $date"
-done >> status.clean
-mv status.clean status
+# skip in favour of systemd timer
+if [ -d /run/systemd/system ]; then
+    exit 0
+fi
+
+# this cronjob persists removals (but not purges)
+if [ ! -x /usr/sbin/logrotate ]; then
+    exit 0
+fi
  
-test -x /usr/sbin/logrotate || exit 0
  /usr/sbin/logrotate /etc/logrotate.conf
+EXITVALUE=$?
+if [ $EXITVALUE != 0 ]; then
+    /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
+fi
+exit $EXITVALUE
diff --git a/cron.daily/mlocate b/cron.daily/mlocate

index 331d063a5c0888f8aecd146e34588d89b8420b78..bc6954140d86cf955b42928c43889f9f60c9d00e 100755 (executable)
--- a/cron.daily/mlocate
+++ b/cron.daily/mlocate
@@ -24,4 +24,4 @@ if [ -x /usr/bin/nocache ]; then
      NOCACHE="/usr/bin/nocache"
  fi
  
-flock --nonblock /run/mlocate.daily.lock $NOCACHE $IONICE /usr/bin/updatedb.mlocate
+flock --nonblock /run/mlocate.daily.lock $NOCACHE $IONICE nice /usr/bin/updatedb.mlocate
diff --git a/cron.daily/ubuntu-advantage-tools b/cron.daily/ubuntu-advantage-tools

deleted file mode 100755 (executable)

index 6d44746..0000000
--- a/cron.daily/ubuntu-advantage-tools
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh -e
-
-UA="/usr/bin/ubuntu-advantage"
-CACHE_DIR="/var/cache/ubuntu-advantage-tools"
-CACHE_FILE="$CACHE_DIR/ubuntu-advantage-status.cache"
-
-[ -x "$UA" ] || exit 0
-
-[ -d "$CACHE_DIR" ] || mkdir -p "$CACHE_DIR"
-
-"$UA" status > "$CACHE_FILE"
-
diff --git a/crontab b/crontab

index 95edd9b1f9252f1ff91bb23e53996aacb23ac51b..c89cc0be816adbf7e92e48c38f1d6273f301cd34 100644 (file)
--- a/crontab
+++ b/crontab
@@ -7,7 +7,14 @@
  SHELL=/bin/sh
  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
  
-# m h dom mon dow user command
+# Example of job definition:
+# .---------------- minute (0 - 59)
+# |  .------------- hour (0 - 23)
+# |  |  .---------- day of month (1 - 31)
+# |  |  |  .------- month (1 - 12) OR jan,feb,mar,apr ...
+# |  |  |  |  .---- day of week (0 - 6) (Sunday=0 or 7) OR sun,mon,tue,wed,thu,fri,sat
+# |  |  |  |  |
+# *  *  *  *  * user-name command to be executed
  17 *   * * *   root    cd / && run-parts --report /etc/cron.hourly
  25 6   * * *   root    test -x /usr/sbin/anacron || ( cd / && run-parts --report /etc/cron.daily )
  47 6   * * 7   root    test -x /usr/sbin/anacron || ( cd / && run-parts --report /etc/cron.weekly )
diff --git a/cups/ppd/FS-1020D.ppd b/cups/ppd/FS-1020D.ppd

index be8e5b1ac373b47f85f0c5d29de1d3823f75dc2d..989059d02c6dafbb917ede381374e90125a5f5ec 100644 (file)
--- a/cups/ppd/FS-1020D.ppd
+++ b/cups/ppd/FS-1020D.ppd
@@ -1,746 +1,746 @@
-*PPD-Adobe: "4.3"\r
-*%=============================================================================\r
-*%\r
-*%  PPD for Kyocera Mita FS-1020D (English)\r
-*%  Linux Version\r
-*%\r
-*%  Copyright (C) 2000 KYOCERA CORPORATION\r
-*%  Copyright (C) 2005 Revised Edition KYOCERA MITA CORPORATION\r
-*%\r
-*%  Permission is hereby granted, free of charge, to any person obtaining\r
-*%  a copy of this software and associated documentation files (the\r
-*%  "Software"), to deal in the Software without restriction, including\r
-*%  without limitation the rights to use, copy, modify, merge, publish,\r
-*%  distribute, sublicense, and/or sell copies of the Software, and to\r
-*%  permit persons to whom the Software is furnished to do so, subject to\r
-*%  the following conditions:\r
-*%\r
-*%  The above copyright notice and this permission notice shall be\r
-*%  included in all copies or substantial portions of the Software.\r
-*%\r
-*%  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
-*%  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
-*%  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
-*%  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
-*%  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
-*%  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
-*%  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
-*%\r
-*%  [this is the MIT open source license -- see www.opensource.org]\r
-*%\r
-*%=============================================================================\r
-\r
-*FileVersion: "8.2"\r
-*FormatVersion: "4.3"\r
-*LanguageEncoding: ISOLatin1 \r
-*PCFileName: "KM1020EN.PPD"\r
-*LanguageVersion: English\r
-*Product: "(FS-1020D)"\r
-*PSVersion: "(3010.106) 1"\r
-*Manufacturer: "Kyocera Mita"\r
-*ModelName: "Kyocera Mita FS-1020D"\r
-*ShortNickName: "Kyocera Mita FS-1020D"\r
-*NickName: "Kyocera Mita FS-1020D"\r
-\r
-*% Basic Device Capabilities\r
-*LanguageLevel: "3"\r
-*ColorDevice: False\r
-*DefaultColorSpace: Gray\r
-*TTRasterizer: Type42\r
-*?TTRasterizer: "\r
-  save\r
-  42 /FontType resourcestatus\r
-  { pop pop (Type42) }{ (None) } ifelse\r
-  = flush restore"\r
-*End\r
-*FreeVM: "9122000"\r
-*Throughput: "20"\r
-\r
-*% System Management\r
-*SuggestedJobTimeout: "0"\r
-*SuggestedManualFeedTimeout: "0"\r
-*SuggestedWaitTimeout: "120"\r
-*PrintPSErrors: True\r
-\r
-*Password: "0"\r
-\r
-*ExitServer: "\r
-  count 0 eq {true}\r
-  {dup statusdict /checkpassword get exec not} ifelse\r
-  {(WARNING : Cannot perform the exitserver command.) =\r
-    (Password supplied is not valid.) =\r
-    (Please contact the author of this software.) = flush quit} if\r
-  serverdict /exitserver get exec"\r
-*End\r
-\r
-*Reset: "\r
-  count 0 eq { true }\r
-  {dup statusdict /checkpassword get exec not} ifelse\r
-  {(WARNING : Cannot perform the exitserver command.) =\r
-    (Password supplied is not valid.) =\r
-    (Please contact the author of this software.) = flush quit} if\r
-  serverdict /exitserver get exec\r
-  systemdict /quit get exec\r
-  (WARNING : Printer Reset Failed.) = flush"\r
-*End\r
-\r
-*% Protocols\r
-*Protocols: PJL TBCP\r
-\r
-*1284Modes Parallel: Compat Nibble ECP\r
-*1284DeviceID: "MFG:Kyocera;MDL:FS-1020D;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;"\r
-\r
-*% JCL Information \r
-*JCLBegin: "<1B>%-12345X@PJL JOB<0A>"\r
-*JCLToPSInterpreter: "@PJL ENTER LANGUAGE=POSTSCRIPT<0A>"\r
-*JCLEnd: "<1B>%-12345X@PJL EOJ<0A><1B>%-12345X"\r
-\r
-*JCLOpenUI *JCLEconomode/EcoPrint: PickOne\r
-*DefaultJCLEconomode: Off\r
-*OrderDependency: 5 JCLSetup *JCLEconomode\r
-*JCLEconomode Off/Off: "@PJL SET ECONOMODE=OFF<0A>"\r
-*JCLEconomode On/On: "@PJL SET ECONOMODE=ON<0A>"\r
-*JCLCloseUI: *JCLEconomode\r
-\r
-*% Installable Options\r
-*OpenGroup: InstallableOptions/Installed Options\r
-\r
-*% Paper Feeder\r
-*OpenUI *Option8/Paper Feeder: Boolean\r
-*DefaultOption8: False\r
-*Option8 None/Not Installed: ""\r
-*Option8 True/Installed: ""\r
-*?Option8: "\r
-  save\r
-  (False) currentpagedevice dup /InputAttributes known {\r
-    /InputAttributes get\r
-    dup 1 known {dup 1 get null ne {exch pop (True) exch} if} if\r
-  } if pop\r
-  = flush restore"\r
-*End\r
-*CloseUI: *Option8\r
-\r
-*% Disk Drive\r
-*OpenUI *Option18/Optional Disk: PickOne\r
-*DefaultOption18: None\r
-*Option18 None/None: ""\r
-*Option18 RAMDisk/RAM Disk: ""\r
-*?Option18: "\r
-  save\r
-  false\r
-  (%disk?%)\r
-  {currentdevparams dup /Writeable known\r
-    {dup /Writeable get\r
-      {exch pop /LogicalSize get dup 0 gt exch 102400 lt eq true}{pop pop false} ifelse\r
-    }{pop pop} ifelse\r
-  } 100 string /IODevice resourceforall\r
-  {{(RAMDisk)}{(HardDisk)} ifelse}{(None)} ifelse\r
-  = flush restore"\r
-*End\r
-*CloseUI: *Option18\r
-\r
-*% Installed Memory\r
-*OpenUI *InstalledMemory/Memory: PickOne\r
-*DefaultInstalledMemory: 16MB\r
-*InstalledMemory 16MB/Standard: ""\r
-*InstalledMemory 24MB/8MB Upgrade: ""\r
-*InstalledMemory 32MB/16MB Upgrade: ""\r
-*InstalledMemory 48MB/32MB Upgrade: ""\r
-*InstalledMemory 80MB/64MB Upgrade: ""\r
-*InstalledMemory 144MB/128MB Upgrade: ""\r
-*InstalledMemory 272MB/256MB Upgrade: ""\r
-*?InstalledMemory: "\r
-  save\r
-  currentsystemparams dup\r
-  /RamSize known {\r
-    /RamSize get\r
-    524288 div ceiling cvi 2 div cvi\r
-    /vmsize 20 string def\r
-    vmsize cvs print\r
-    (MB) print (\n) print flush\r
-  }{\r
-    pop (Unknown) print flush\r
-  } ifelse\r
-  restore"\r
-*End\r
-*CloseUI: *InstalledMemory\r
-\r
-*CloseGroup: InstallableOptions\r
-\r
-*% Virtual Memory \r
-*VMOption 16MB: "9122000"\r
-*VMOption 24MB: "19008000"\r
-*VMOption 32MB: "22544000"\r
-*VMOption 48MB: "35966000"\r
-*VMOption 80MB: "59328000"\r
-*VMOption 144MB: "59328000"\r
-*VMOption 272MB: "59328000"\r
-\r
-\r
-*% Constraints\r
-*UIConstraints: *Option8 None *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *Option8 None\r
-*UIConstraints: *MediaType Transparency *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *MediaType Transparency\r
-*UIConstraints: *MediaType Labels *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *MediaType Labels\r
-*UIConstraints: *MediaType Envelope *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *MediaType Envelope\r
-*UIConstraints: *MediaType Vellum *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *MediaType Vellum\r
-*UIConstraints: *MediaType Cardstock *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *MediaType Cardstock\r
-*UIConstraints: *MediaType Transparency *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *MediaType Transparency\r
-*UIConstraints: *MediaType Labels *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *MediaType Labels\r
-*UIConstraints: *MediaType Envelope *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *MediaType Envelope\r
-*UIConstraints: *MediaType Vellum *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *MediaType Vellum\r
-*UIConstraints: *MediaType Cardstock *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *MediaType Cardstock\r
-*UIConstraints: *KCCollate *Option18 None\r
-*UIConstraints: *Option18 None *KCCollate Temp\r
-*UIConstraints: *PageSize A6 *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageSize A6\r
-*UIConstraints: *PageRegion A6 *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageRegion A6\r
-*UIConstraints: *PageSize B6 *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageSize B6\r
-*UIConstraints: *PageRegion B6 *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageRegion B6\r
-*UIConstraints: *PageSize EnvPersonal *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageSize EnvPersonal\r
-*UIConstraints: *PageRegion EnvPersonal *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageRegion EnvPersonal\r
-*UIConstraints: *PageSize Env9 *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageSize Env9\r
-*UIConstraints: *PageRegion Env9 *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageRegion Env9\r
-*UIConstraints: *PageSize Env10 *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageSize Env10\r
-*UIConstraints: *PageRegion Env10 *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageRegion Env10\r
-*UIConstraints: *PageSize EnvMonarch *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageSize EnvMonarch\r
-*UIConstraints: *PageRegion EnvMonarch *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageRegion EnvMonarch\r
-*UIConstraints: *PageSize EnvDL *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageSize EnvDL\r
-*UIConstraints: *PageRegion EnvDL *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageRegion EnvDL\r
-*UIConstraints: *PageSize EnvC5 *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageSize EnvC5\r
-*UIConstraints: *PageRegion EnvC5 *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageRegion EnvC5\r
-*UIConstraints: *PageSize Statement *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageSize Statement\r
-*UIConstraints: *PageRegion Statement *InputSlot Internal\r
-*UIConstraints: *InputSlot Internal *PageRegion Statement\r
-*UIConstraints: *PageSize Executive *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageSize Executive\r
-*UIConstraints: *PageRegion Executive *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageRegion Executive\r
-*UIConstraints: *PageSize A6 *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageSize A6\r
-*UIConstraints: *PageRegion A6 *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageRegion A6\r
-*UIConstraints: *PageSize B6 *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageSize B6\r
-*UIConstraints: *PageRegion B6 *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageRegion B6\r
-*UIConstraints: *PageSize EnvPersonal *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageSize EnvPersonal\r
-*UIConstraints: *PageRegion EnvPersonal *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageRegion EnvPersonal\r
-*UIConstraints: *PageSize Env9 *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageSize Env9\r
-*UIConstraints: *PageRegion Env9 *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageRegion Env9\r
-*UIConstraints: *PageSize Env10 *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageSize Env10\r
-*UIConstraints: *PageRegion Env10 *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageRegion Env10\r
-*UIConstraints: *PageSize EnvMonarch *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageSize EnvMonarch\r
-*UIConstraints: *PageRegion EnvMonarch *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageRegion EnvMonarch\r
-*UIConstraints: *PageSize EnvDL *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageSize EnvDL\r
-*UIConstraints: *PageRegion EnvDL *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageRegion EnvDL\r
-*UIConstraints: *PageSize EnvC5 *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageSize EnvC5\r
-*UIConstraints: *PageRegion EnvC5 *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageRegion EnvC5\r
-*UIConstraints: *PageSize Statement *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageSize Statement\r
-*UIConstraints: *PageRegion Statement *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageRegion Statement\r
-*UIConstraints: *PageSize P16K *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageSize P16K\r
-*UIConstraints: *PageRegion P16K *InputSlot PF17\r
-*UIConstraints: *InputSlot PF17 *PageRegion P16K\r
-*UIConstraints: *Duplex *PageSize Executive\r
-*UIConstraints: *PageSize Executive *Duplex DuplexTumble\r
-*UIConstraints: *PageSize Executive *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion Executive\r
-*UIConstraints: *PageRegion Executive *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion Executive *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize A6\r
-*UIConstraints: *PageSize A6 *Duplex DuplexTumble\r
-*UIConstraints: *PageSize A6 *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion A6\r
-*UIConstraints: *PageRegion A6 *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion A6 *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize ISOB5\r
-*UIConstraints: *PageSize ISOB5 *Duplex DuplexTumble\r
-*UIConstraints: *PageSize ISOB5 *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion ISOB5\r
-*UIConstraints: *PageRegion ISOB5 *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion ISOB5 *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize B6\r
-*UIConstraints: *PageSize B6 *Duplex DuplexTumble\r
-*UIConstraints: *PageSize B6 *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion B6\r
-*UIConstraints: *PageRegion B6 *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion B6 *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize EnvPersonal\r
-*UIConstraints: *PageSize EnvPersonal *Duplex DuplexTumble\r
-*UIConstraints: *PageSize EnvPersonal *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion EnvPersonal\r
-*UIConstraints: *PageRegion EnvPersonal *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion EnvPersonal *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize Env9\r
-*UIConstraints: *PageSize Env9 *Duplex DuplexTumble\r
-*UIConstraints: *PageSize Env9 *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion Env9\r
-*UIConstraints: *PageRegion Env9 *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion Env9 *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize Env10\r
-*UIConstraints: *PageSize Env10 *Duplex DuplexTumble\r
-*UIConstraints: *PageSize Env10 *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion Env10\r
-*UIConstraints: *PageRegion Env10 *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion Env10 *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize EnvMonarch\r
-*UIConstraints: *PageSize EnvMonarch *Duplex DuplexTumble\r
-*UIConstraints: *PageSize EnvMonarch *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion EnvMonarch\r
-*UIConstraints: *PageRegion EnvMonarch *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion EnvMonarch *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize EnvDL\r
-*UIConstraints: *PageSize EnvDL *Duplex DuplexTumble\r
-*UIConstraints: *PageSize EnvDL *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion EnvDL\r
-*UIConstraints: *PageRegion EnvDL *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion EnvDL *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize EnvC5\r
-*UIConstraints: *PageSize EnvC5 *Duplex DuplexTumble\r
-*UIConstraints: *PageSize EnvC5 *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion EnvC5\r
-*UIConstraints: *PageRegion EnvC5 *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion EnvC5 *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize OficioII\r
-*UIConstraints: *PageSize OficioII *Duplex DuplexTumble\r
-*UIConstraints: *PageSize OficioII *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion OficioII\r
-*UIConstraints: *PageRegion OficioII *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion OficioII *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize Folio\r
-*UIConstraints: *PageSize Folio *Duplex DuplexTumble\r
-*UIConstraints: *PageSize Folio *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion Folio\r
-*UIConstraints: *PageRegion Folio *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion Folio *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize Statement\r
-*UIConstraints: *PageSize Statement *Duplex DuplexTumble\r
-*UIConstraints: *PageSize Statement *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion Statement\r
-*UIConstraints: *PageRegion Statement *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion Statement *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageSize P16K\r
-*UIConstraints: *PageSize P16K *Duplex DuplexTumble\r
-*UIConstraints: *PageSize P16K *Duplex DuplexNoTumble\r
-*UIConstraints: *Duplex *PageRegion P16K\r
-*UIConstraints: *PageRegion P16K *Duplex DuplexTumble\r
-*UIConstraints: *PageRegion P16K *Duplex DuplexNoTumble\r
-\r
-*% Resolution \r
-*OpenUI *Resolution/Resolution: PickOne\r
-*OrderDependency: 10 AnySetup *Resolution\r
-*DefaultResolution: 800dpi\r
-*Resolution 300dpi/300 dpi: "<< /HWResolution [300 300] >> setpagedevice"\r
-*Resolution 600dpi/600 dpi: "<< /HWResolution [600 600] >> setpagedevice"\r
-*Resolution 800dpi/Fast 1200 dpi: "<< /HWResolution [600 600] /PreRenderingEnhance true >> setpagedevice"\r
-*?Resolution: "save currentpagedevice /HWResolution get 0 get (      ) cvs print (dpi) = flush restore"\r
-*CloseUI: *Resolution\r
-\r
-*% Image Refinement \r
-*OpenUI *Smoothing/KIR: PickOne\r
-*OrderDependency: 50 AnySetup *Smoothing\r
-*DefaultSmoothing: Medium\r
-*Smoothing None/Off: "0 statusdict /setdoret get exec"\r
-*Smoothing Medium/On: "2 statusdict /setdoret get exec"\r
-*?Smoothing: "\r
-  save\r
-  [(None)(Medium)(Medium)(Medium)]\r
-  statusdict /doret get exec {get} stopped\r
-  {pop pop (Unknown)} if\r
-  = flush restore"\r
-*End\r
-*CloseUI: *Smoothing\r
-\r
-*% Halftone Information \r
-*DefaultHalftoneType: 1\r
-*ScreenFreq: "37.5"\r
-*ScreenAngle: "45.0"\r
-*ResScreenFreq 600dpi: "37.5"\r
-*ResScreenAngle 600dpi: "45.0"\r
-*ResScreenFreq 300dpi: "18.75"\r
-*ResScreenAngle 300dpi: "45.0"\r
-\r
-*DefaultScreenProc: Ellipse\r
-*ScreenProc Dot: "\r
-  {abs exch abs 2 copy add 1 gt\r
-  {1 sub dup mul exch 1 sub dup mul add 1 sub}\r
-  {dup mul exch dup mul add 1 exch sub} ifelse}"\r
-*End\r
-*ScreenProc Line: "{pop}"\r
-*ScreenProc Ellipse: "{dup 5 mul 8 div mul exch dup mul exch add sqrt 1 exch sub}"\r
-*DefaultTransfer: Null\r
-*Transfer Null: "{}"\r
-*Transfer Null.Inverse: "{1 exch sub}"\r
-\r
-*% Paper Handling \r
-*% Page Size Definitions\r
-*OpenUI *PageSize: PickOne\r
-*OrderDependency: 40 AnySetup *PageSize\r
-*DefaultPageSize: A4\r
-*PageSize A4/A4: "<< /Policies << /PageSize 7 >> /PageSize [595 842] /ImagingBBox null >> setpagedevice"\r
-*PageSize A5/A5: "<< /Policies << /PageSize 7 >> /PageSize [420 595] /ImagingBBox null >> setpagedevice"\r
-*PageSize A6/A6: "<< /Policies << /PageSize 7 >> /PageSize [297 420] /ImagingBBox null >> setpagedevice"\r
-*PageSize B5/B5 (JIS): "<< /Policies << /PageSize 7 >> /PageSize [516 729] /ImagingBBox null >> setpagedevice"\r
-*PageSize ISOB5/B5 (ISO): "<< /Policies << /PageSize 7 >> /PageSize [499 709] /ImagingBBox null >> setpagedevice"\r
-*PageSize B6/B6: "<< /Policies << /PageSize 7 >> /PageSize [363 516] /ImagingBBox null >> setpagedevice"\r
-*PageSize OficioII/Oficio II: "<< /Policies << /PageSize 7 >> /PageSize [612 936] /ImagingBBox null >> setpagedevice"\r
-*PageSize Folio/8.5X13 (Folio): "<< /Policies << /PageSize 7 >> /PageSize [595 935] /ImagingBBox null >> setpagedevice"\r
-*PageSize Statement/Statement: "<< /Policies << /PageSize 7 >> /PageSize [396 612] /ImagingBBox null >> setpagedevice"\r
-*PageSize P16K/16K: "<< /Policies << /PageSize 7 >> /PageSize [558 774] /ImagingBBox null >> setpagedevice"\r
-*PageSize Letter/Letter: "<< /Policies << /PageSize 7 >> /PageSize [612 792] /ImagingBBox null >> setpagedevice"\r
-*PageSize Legal/Legal: "<< /Policies << /PageSize 7 >> /PageSize [612 1008] /ImagingBBox null >> setpagedevice"\r
-*PageSize Executive/Executive: "<< /Policies << /PageSize 7 >> /PageSize [522 756] /ImagingBBox null >> setpagedevice"\r
-*PageSize EnvPersonal/Envelope #6: "<< /Policies << /PageSize 7 >> /PageSize [261 468] /ImagingBBox null >> setpagedevice"\r
-*PageSize Env9/Envelope #9: "<< /Policies << /PageSize 7 >> /PageSize [279 639] /ImagingBBox null >> setpagedevice"\r
-*PageSize Env10/Envelope #10: "<< /Policies << /PageSize 7 >> /PageSize [297 684] /ImagingBBox null >> setpagedevice"\r
-*PageSize EnvMonarch/Envelope Monarch: "<< /Policies << /PageSize 7 >> /PageSize [279 540] /ImagingBBox null >> setpagedevice"\r
-*PageSize EnvDL/Envelope DL: "<< /Policies << /PageSize 7 >> /PageSize [312 624] /ImagingBBox null >> setpagedevice"\r
-*PageSize EnvC5/Envelope C5: "<< /Policies << /PageSize 7 >> /PageSize [459 649] /ImagingBBox null >> setpagedevice"\r
-*?PageSize: "\r
-  save\r
-  currentpagedevice /PageSize get aload pop\r
-  2 copy gt {exch} if\r
-  (Unknown)\r
-  19 dict\r
-  dup [595 842] (A4) put\r
-  dup [420 595] (A5) put\r
-  dup [297 420] (A6) put\r
-  dup [516 729] (B5) put\r
-  dup [499 709] (ISOB5) put\r
-  dup [363 516] (B6) put\r
-  dup [612 936] (OficioII) put\r
-  dup [595 935] (Folio) put\r
-  dup [396 612] (Statement) put\r
-  dup [558 774] (P16K) put\r
-  dup [612 792] (Letter) put\r
-  dup [612 1008] (Legal) put\r
-  dup [522 756] (Executive) put\r
-  dup [261 468] (EnvPersonal) put\r
-  dup [279 639] (Env9) put\r
-  dup [297 684] (Env10) put\r
-  dup [279 540] (EnvMonarch) put\r
-  dup [312 624] (EnvDL) put\r
-  dup [459 649] (EnvC5) put\r
-  {exch aload pop 4 index sub abs 5 le exch\r
-    5 index sub abs 5 le and\r
-    {exch pop exit}{pop} ifelse\r
-  } bind forall\r
-  = flush pop pop restore "\r
-*End\r
-*CloseUI: *PageSize\r
-\r
-*% Page Region Definitions for Frame Buffer\r
-*OpenUI *PageRegion: PickOne\r
-*OrderDependency: 40 AnySetup *PageRegion\r
-*DefaultPageRegion: A4\r
-*PageRegion A4/A4: "<< /Policies << /PageSize 7 >> /PageSize [595 842] /ImagingBBox null >> setpagedevice"\r
-*PageRegion A5/A5: "<< /Policies << /PageSize 7 >> /PageSize [420 595] /ImagingBBox null >> setpagedevice"\r
-*PageRegion A6/A6: "<< /Policies << /PageSize 7 >> /PageSize [297 420] /ImagingBBox null >> setpagedevice"\r
-*PageRegion B5/B5 (JIS): "<< /Policies << /PageSize 7 >> /PageSize [516 729] /ImagingBBox null >> setpagedevice"\r
-*PageRegion ISOB5/B5 (ISO): "<< /Policies << /PageSize 7 >> /PageSize [499 709] /ImagingBBox null >> setpagedevice"\r
-*PageRegion B6/B6: "<< /Policies << /PageSize 7 >> /PageSize [363 516] /ImagingBBox null >> setpagedevice"\r
-*PageRegion Letter/Letter: "<< /Policies << /PageSize 7 >> /PageSize [612 792] /ImagingBBox null >> setpagedevice"\r
-*PageRegion Legal/Legal: "<< /Policies << /PageSize 7 >> /PageSize [612 1008] /ImagingBBox null >> setpagedevice"\r
-*PageRegion Executive/Executive: "<< /Policies << /PageSize 7 >> /PageSize [522 756] /ImagingBBox null >> setpagedevice"\r
-*PageRegion EnvPersonal/Envelope #6: "<< /Policies << /PageSize 7 >> /PageSize [261 468] /ImagingBBox null >> setpagedevice"\r
-*PageRegion Env9/Envelope #9: "<< /Policies << /PageSize 7 >> /PageSize [279 639] /ImagingBBox null >> setpagedevice"\r
-*PageRegion Env10/Envelope #10: "<< /Policies << /PageSize 7 >> /PageSize [297 684] /ImagingBBox null >> setpagedevice"\r
-*PageRegion EnvMonarch/Envelope Monarch: "<< /Policies << /PageSize 7 >> /PageSize [279 540] /ImagingBBox null >> setpagedevice"\r
-*PageRegion EnvDL/Envelope DL: "<< /Policies << /PageSize 7 >> /PageSize [312 624] /ImagingBBox null >> setpagedevice"\r
-*PageRegion EnvC5/Envelope C5: "<< /Policies << /PageSize 7 >> /PageSize [459 649] /ImagingBBox null >> setpagedevice"\r
-*PageRegion OficioII/Oficio II: "<< /Policies << /PageSize 7 >> /PageSize [612 936] /ImagingBBox null >> setpagedevice"\r
-*PageRegion Folio/8.5X13 (Folio): "<< /Policies << /PageSize 7 >> /PageSize [595 935] /ImagingBBox null >> setpagedevice"\r
-*PageRegion Statement/Statement: "<< /Policies << /PageSize 7 >> /PageSize [396 612] /ImagingBBox null >> setpagedevice"\r
-*PageRegion P16K/16K: "<< /Policies << /PageSize 7 >> /PageSize [558 774] /ImagingBBox null >> setpagedevice"\r
-*CloseUI: *PageRegion\r
-\r
-*% Imageable Area Definitions\r
-*DefaultImageableArea: A4\r
-*ImageableArea A4/A4: "12 10 583 832"\r
-*ImageableArea A5/A5: "12 12 409 585"\r
-*ImageableArea A6/A6: "12 10 285 411"\r
-*ImageableArea B5/B5 (JIS): "21 10 495 719"\r
-*ImageableArea ISOB5/B5 (ISO): "12 12 487 696"\r
-*ImageableArea B6/B6: "12 10 352 506"\r
-*ImageableArea OficioII/Oficio II: "12 12 600 924"\r
-*ImageableArea Folio/8.5X13 (Folio): "12 12 571 911"\r
-*ImageableArea Statement/Statement: "12 12 384 600"\r
-*ImageableArea P16K/16K: "12 12 546 762"\r
-*ImageableArea Letter/Letter: "12 08 600 784"\r
-*ImageableArea Legal/Legal: "12 08 600 1000"\r
-*ImageableArea Executive/Executive: "12 08 510 748"\r
-*ImageableArea EnvPersonal/Envelope #6: "12 08 237 452"\r
-*ImageableArea Env9/Envelope #9: "12 08 255 623"\r
-*ImageableArea Env10/Envelope #10: "12 08 273 668"\r
-*ImageableArea EnvMonarch/Envelope Monarch: "12 08 255 524"\r
-*ImageableArea EnvDL/Envelope DL: "12 10 288 604"\r
-*ImageableArea EnvC5/Envelope C5: "12 10 435 629"\r
-*?ImageableArea: "\r
-  save\r
-  /cvp {cvi (                   ) cvs\r
-  print ( ) print} bind def\r
-  newpath clippath pathbbox\r
-  4 -2 roll exch 2 {ceiling cvp} repeat\r
-  exch 2 {floor cvp} repeat ( )\r
-  = flush restore"\r
-*End\r
-\r
-*% Physical Dimensions of Media\r
-*DefaultPaperDimension: A4\r
-*PaperDimension A4/A4: "595 842"\r
-*PaperDimension A5/A5: "420 595"\r
-*PaperDimension A6/A6: "297 420"\r
-*PaperDimension B5/B5 (JIS): "516 729"\r
-*PaperDimension ISOB5/B5 (ISO): "499 709"\r
-*PaperDimension B6/B6: "363 516"\r
-*PaperDimension OficioII/Oficio II: "612 936"\r
-*PaperDimension Folio/8.5X13 (Folio): "595 935"\r
-*PaperDimension Statement/Statement: "396 612"\r
-*PaperDimension P16K/16K: "558 774"\r
-*PaperDimension Letter/Letter: "612 792"\r
-*PaperDimension Legal/Legal: "612 1008"\r
-*PaperDimension Executive/Executive: "522 756"\r
-*PaperDimension EnvPersonal/Envelope #6: "261 468"\r
-*PaperDimension Env9/Envelope #9: "279 639"\r
-*PaperDimension Env10/Envelope #10: "297 684"\r
-*PaperDimension EnvMonarch/Envelope Monarch: "279 540"\r
-*PaperDimension EnvDL/Envelope DL: "312 624"\r
-*PaperDimension EnvC5/Envelope C5: "459 649"\r
-\r
-*% Input Slot Definitions\r
-*OpenUI *InputSlot: PickOne\r
-*OrderDependency: 30 AnySetup *InputSlot\r
-*DefaultInputSlot: Internal\r
-*InputSlot Internal/Cassette 1 (Internal): "<</ManualFeed false>> setpagedevice statusdict begin 0 setpapertray end"\r
-*InputSlot PF17/Cassette 2: "<</ManualFeed false>> setpagedevice statusdict begin 1 setpapertray end"\r
-*InputSlot MF1/Multi Purpose Feeder: "currentpagedevice /InputAttributes get 3 get null eq\r
-{ <</ManualFeed true>> setpagedevice }{ statusdict begin 3 setpapertray end } ifelse"\r
-*End\r
-*InputSlot MF/Manual Feed: "<< /ManualFeed true >> setpagedevice"\r
-*?InputSlot: ""\r
-*CloseUI: *InputSlot\r
-\r
-*% MediaType Definitions\r
-*OpenUI *MediaType: PickOne\r
-*OrderDependency: 100 AnySetup *MediaType\r
-*DefaultMediaType: PrnDef\r
-*MediaType PrnDef/Printer Default: ""\r
-*MediaType Plain/Plain Paper: "<</ManualFeed false /MediaType (Plain) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType Transparency/Transparency: "<</ManualFeed false /MediaType (Transparency) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType Labels/Labels: "<</ManualFeed false /MediaType (Labels) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType Letterhead/Letterhead: "<</ManualFeed false /MediaType (Letterhead) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType Bond/Bond: "<</ManualFeed false /MediaType (Bond) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType Color/Color: "<</ManualFeed false /MediaType (Color) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType Preprinted/Preprinted: "<</ManualFeed false /MediaType (Preprinted) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType Prepunched/Prepunched: "<</ManualFeed false /MediaType (Prepunched) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType Recycled/Recycled: "<</ManualFeed false /MediaType (Recycled) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType Rough/Rough: "<</ManualFeed false /MediaType (Rough) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType Cardstock/Cardstock: "<</ManualFeed false /MediaType (Card Stock) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType Vellum/Vellum: "<</ManualFeed false /MediaType (Vellum) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType Envelope/Envelope: "<</ManualFeed false /MediaType (Envelope) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType User1/Custom 1: "<</ManualFeed false /MediaType (Custom Type1) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType User2/Custom 2: "<</ManualFeed false /MediaType (Custom Type2) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType User3/Custom 3: "<</ManualFeed false /MediaType (Custom Type3) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType User4/Custom 4: "<</ManualFeed false /MediaType (Custom Type4) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType User5/Custom 5: "<</ManualFeed false /MediaType (Custom Type5) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType User6/Custom 6: "<</ManualFeed false /MediaType (Custom Type6) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType User7/Custom 7: "<</ManualFeed false /MediaType (Custom Type7) /DeferredMediaSelection true >> setpagedevice"\r
-*MediaType User8/Custom 8: "<</ManualFeed false /MediaType (Custom Type8) /DeferredMediaSelection true >> setpagedevice"\r
-*?MediaType: "\r
-  save\r
-    currentpagedevice /MediaType {get} stopped\r
-    {pop pop (Unknown)} {dup null eq {pop (Unknown)} if} ifelse = flush\r
-  restore"\r
-*End\r
-*CloseUI: *MediaType\r
-\r
-*RequiresPageRegion All: True\r
-*% Duplex Definitions\r
-*OpenUI *Duplex/Duplexing: PickOne\r
-*OrderDependency: 50 AnySetup *Duplex\r
-*DefaultDuplex: None\r
-*Duplex None/None: "statusdict begin false setduplexmode false settumble end"\r
-*Duplex DuplexTumble/Short Edge: "statusdict begin true setduplexmode true settumble end"\r
-*Duplex DuplexNoTumble/Long Edge: "statusdict begin true setduplexmode false settumble end"\r
-*?Duplex: "\r
-  save\r
-  statusdict begin\r
-  duplexmode\r
-  {tumble {(DuplexTumble)}{(DuplexNoTumble)} ifelse}\r
-  {(None)} ifelse\r
-  = flush end restore"\r
-*End\r
-*CloseUI: *Duplex\r
-\r
-*% Job Spooling Definitions\r
-*OpenUI *KCCollate/Job Settings: PickOne\r
-*OrderDependency: 20 AnySetup *KCCollate\r
-*DefaultKCCollate: None\r
-*KCCollate None/None: ""\r
-*KCCollate Temp/Temporary: "\r
-  userdict /UICollateDetails known not {userdict /UICollateDetails 10 dict put} if\r
-  userdict /UICollateDetails get /Mode 0 put <</Collate true /CollateDetails UICollateDetails>> setpagedevice"\r
-*End\r
-*?KCCollate: "\r
-  save\r
-  currentpagedevice dup /Collate known {\r
-    dup /CollateDetails known {\r
-      /CollateDetails get\r
-      dup /Mode known {\r
-        /Mode get\r
-        1 {\r
-          dup 0 eq {pop (Temp) exit} if\r
-          pop (Unknown)\r
-        } repeat\r
-      }{pop (Unknown)} ifelse\r
-    }{pop (Unknown)} ifelse\r
-  }{pop (Unknown)} ifelse\r
-  = flush restore"\r
-*End\r
-*CloseUI: *KCCollate\r
-\r
-*% PPD Version Info \r
-*OpenUI *KMVersion/PPD Version: PickOne\r
-*OrderDependency: 25 AnySetup *KMVersion\r
-*DefaultKMVersion: Default\r
-*KMVersion Default/8.2.0111 [01-11-2005]: "\r
-globaldict /ct_AddStdCIDMap known {\r
-globaldict /ct_AddStdCIDMap get  length 7 eq\r
-{globaldict /ct_AddStdCIDMap get  0 get type /stringtype eq\r
-{globaldict /ct_AddStdCIDMap get  1 get 0 eq\r
-{globaldict /ct_AddStdCIDMap get  2 get () eq\r
-{globaldict /ct_AddStdCIDMap get  3 get /SubFileDecode eq\r
-{globaldict /ct_AddStdCIDMap get  4 get systemdict /filter get eq\r
-{currentglobal true setglobal globaldict\r
-/ct_AddStdCIDMap\r
-globaldict /ct_AddStdCIDMap get dup\r
-globaldict /ct_AddStdCIDMap get\r
-0 get length 1 exch\r
-put put setglobal\r
-} if} if} if} if} if} if} if"\r
-*End\r
-*CloseUI: *KMVersion\r
-\r
-*% Font Information\r
-*DefaultFont: Courier\r
-*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM\r
-*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM\r
-*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM\r
-*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM\r
-*Font Bookman-Light: Standard "(001.004S)" Standard ROM\r
-*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM\r
-*Font Bookman-Demi: Standard "(001.004S)" Standard ROM\r
-*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM\r
-*Font Courier: Standard "(002.004S)" Standard ROM\r
-*Font Courier-Oblique: Standard "(002.004S)" Standard ROM\r
-*Font Courier-Bold: Standard "(002.004S)" Standard ROM\r
-*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM\r
-*Font Helvetica: Standard "(001.006S)" Standard ROM\r
-*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM\r
-*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM\r
-*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM\r
-*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM\r
-*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM\r
-*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM\r
-*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM\r
-*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM\r
-*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM\r
-*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM\r
-*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM\r
-*Font Palatino-Roman: Standard "(001.005S)" Standard ROM\r
-*Font Palatino-Italic: Standard "(001.005S)" Standard ROM\r
-*Font Palatino-Bold: Standard "(001.005S)" Standard ROM\r
-*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM\r
-*Font Symbol: Special "(001.007S)" Special ROM\r
-*Font Times-Roman: Standard "(001.007S)" Standard ROM\r
-*Font Times-Italic: Standard "(001.007S)" Standard ROM\r
-*Font Times-Bold: Standard "(001.007S)" Standard ROM\r
-*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM\r
-*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM\r
-*Font ZapfDingbats: Special "(001.004S)" Special ROM\r
-*?FontQuery: "\r
-  save\r
-  /str 100 string dup 0 (fonts/) putinterval def\r
-  {count 1 gt\r
-    { exch dup str 6 94 getinterval cvs\r
-      (/) print print (:) print\r
-      FontDirectory exch known\r
-      {(Yes)}{(No)} ifelse =\r
-    }{exit} ifelse\r
-  } bind loop (*)\r
-  = flush restore"\r
-*End\r
-*?FontList: "save FontDirectory { pop == } bind forall flush (*) = flush restore"\r
-*% Printer Messages\r
-*Message: "%%[ exitserver: permanent state may be changed ]%%"\r
-*Message: "%%[ Flushing: rest of job (to end-of-file) will be ignored ]%%"\r
-*Message: "\FontName\ not found, using Courier"\r
-\r
-*% Status (format: %%[ status: <one of these> ]%% )\r
-*Status: "warming up"/warming up\r
-*Status: "idle"/idle\r
-*Status: "busy"/busy\r
-*Status: "waiting"/waiting\r
-*Status: "printing"/printing\r
-*Status: "initializing"/initializing\r
-*Status: "printing test page"/printing test page\r
-*% Printer Error (format: %%[ PrinterError: <one of these> ]%% )\r
-*PrinterError: "paper entry misfeed"\r
-*PrinterError: "cover open"\r
-*PrinterError: "no paper tray"\r
-*PrinterError: "out of paper"\r
-*PrinterError: "toner low (halt)"\r
-*PrinterError: "warming up"\r
-*PrinterError: "other reason"\r
-*PrinterError: "video interface mode"\r
-*PrinterError: "offline"\r
-*PrinterError: "toner low (warning)"\r
-\r
-*% Input Sources (format: %%[ status: <stat>;source:<one of these> ]%% )\r
-*Source: "Serial"\r
-*Source: "Parallel"\r
-*Source: "LocalTalk"\r
-*Source: "Option"\r
-\r
-*%  End of PPD file for Kyocera Mita FS-1020D (English)\r
+*PPD-Adobe: "4.3"
+*%=============================================================================
+*%
+*%  PPD for Kyocera Mita FS-1020D (English)
+*%  Linux Version
+*%
+*%  Copyright (C) 2000 KYOCERA CORPORATION
+*%  Copyright (C) 2005 Revised Edition KYOCERA MITA CORPORATION
+*%
+*%  Permission is hereby granted, free of charge, to any person obtaining
+*%  a copy of this software and associated documentation files (the
+*%  "Software"), to deal in the Software without restriction, including
+*%  without limitation the rights to use, copy, modify, merge, publish,
+*%  distribute, sublicense, and/or sell copies of the Software, and to
+*%  permit persons to whom the Software is furnished to do so, subject to
+*%  the following conditions:
+*%
+*%  The above copyright notice and this permission notice shall be
+*%  included in all copies or substantial portions of the Software.
+*%
+*%  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+*%  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+*%  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+*%  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+*%  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+*%  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+*%  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*%
+*%  [this is the MIT open source license -- see www.opensource.org]
+*%
+*%=============================================================================
+
+*FileVersion: "8.2"
+*FormatVersion: "4.3"
+*LanguageEncoding: ISOLatin1 
+*PCFileName: "KM1020EN.PPD"
+*LanguageVersion: English
+*Product: "(FS-1020D)"
+*PSVersion: "(3010.106) 1"
+*Manufacturer: "Kyocera Mita"
+*ModelName: "Kyocera Mita FS-1020D"
+*ShortNickName: "Kyocera Mita FS-1020D"
+*NickName: "Kyocera Mita FS-1020D"
+
+*% Basic Device Capabilities
+*LanguageLevel: "3"
+*ColorDevice: False
+*DefaultColorSpace: Gray
+*TTRasterizer: Type42
+*?TTRasterizer: "
+  save
+  42 /FontType resourcestatus
+  { pop pop (Type42) }{ (None) } ifelse
+  = flush restore"
+*End
+*FreeVM: "9122000"
+*Throughput: "20"
+
+*% System Management
+*SuggestedJobTimeout: "0"
+*SuggestedManualFeedTimeout: "0"
+*SuggestedWaitTimeout: "120"
+*PrintPSErrors: True
+
+*Password: "0"
+
+*ExitServer: "
+  count 0 eq {true}
+  {dup statusdict /checkpassword get exec not} ifelse
+  {(WARNING : Cannot perform the exitserver command.) =
+    (Password supplied is not valid.) =
+    (Please contact the author of this software.) = flush quit} if
+  serverdict /exitserver get exec"
+*End
+
+*Reset: "
+  count 0 eq { true }
+  {dup statusdict /checkpassword get exec not} ifelse
+  {(WARNING : Cannot perform the exitserver command.) =
+    (Password supplied is not valid.) =
+    (Please contact the author of this software.) = flush quit} if
+  serverdict /exitserver get exec
+  systemdict /quit get exec
+  (WARNING : Printer Reset Failed.) = flush"
+*End
+
+*% Protocols
+*Protocols: PJL TBCP
+
+*1284Modes Parallel: Compat Nibble ECP
+*1284DeviceID: "MFG:Kyocera;MDL:FS-1020D;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;"
+
+*% JCL Information 
+*JCLBegin: "<1B>%-12345X@PJL JOB<0A>"
+*JCLToPSInterpreter: "@PJL ENTER LANGUAGE=POSTSCRIPT<0A>"
+*JCLEnd: "<1B>%-12345X@PJL EOJ<0A><1B>%-12345X"
+
+*JCLOpenUI *JCLEconomode/EcoPrint: PickOne
+*DefaultJCLEconomode: Off
+*OrderDependency: 5 JCLSetup *JCLEconomode
+*JCLEconomode Off/Off: "@PJL SET ECONOMODE=OFF<0A>"
+*JCLEconomode On/On: "@PJL SET ECONOMODE=ON<0A>"
+*JCLCloseUI: *JCLEconomode
+
+*% Installable Options
+*OpenGroup: InstallableOptions/Installed Options
+
+*% Paper Feeder
+*OpenUI *Option8/Paper Feeder: Boolean
+*DefaultOption8: None
+*Option8 None/Not Installed: ""
+*Option8 True/Installed: ""
+*?Option8: "
+  save
+  (False) currentpagedevice dup /InputAttributes known {
+    /InputAttributes get
+    dup 1 known {dup 1 get null ne {exch pop (True) exch} if} if
+  } if pop
+  = flush restore"
+*End
+*CloseUI: *Option8
+
+*% Disk Drive
+*OpenUI *Option18/Optional Disk: PickOne
+*DefaultOption18: None
+*Option18 None/None: ""
+*Option18 RAMDisk/RAM Disk: ""
+*?Option18: "
+  save
+  false
+  (%disk?%)
+  {currentdevparams dup /Writeable known
+    {dup /Writeable get
+      {exch pop /LogicalSize get dup 0 gt exch 102400 lt eq true}{pop pop false} ifelse
+    }{pop pop} ifelse
+  } 100 string /IODevice resourceforall
+  {{(RAMDisk)}{(HardDisk)} ifelse}{(None)} ifelse
+  = flush restore"
+*End
+*CloseUI: *Option18
+
+*% Installed Memory
+*OpenUI *InstalledMemory/Memory: PickOne
+*DefaultInstalledMemory: 16MB
+*InstalledMemory 16MB/Standard: ""
+*InstalledMemory 24MB/8MB Upgrade: ""
+*InstalledMemory 32MB/16MB Upgrade: ""
+*InstalledMemory 48MB/32MB Upgrade: ""
+*InstalledMemory 80MB/64MB Upgrade: ""
+*InstalledMemory 144MB/128MB Upgrade: ""
+*InstalledMemory 272MB/256MB Upgrade: ""
+*?InstalledMemory: "
+  save
+  currentsystemparams dup
+  /RamSize known {
+    /RamSize get
+    524288 div ceiling cvi 2 div cvi
+    /vmsize 20 string def
+    vmsize cvs print
+    (MB) print (\n) print flush
+  }{
+    pop (Unknown) print flush
+  } ifelse
+  restore"
+*End
+*CloseUI: *InstalledMemory
+
+*CloseGroup: InstallableOptions
+
+*% Virtual Memory 
+*VMOption 16MB: "9122000"
+*VMOption 24MB: "19008000"
+*VMOption 32MB: "22544000"
+*VMOption 48MB: "35966000"
+*VMOption 80MB: "59328000"
+*VMOption 144MB: "59328000"
+*VMOption 272MB: "59328000"
+
+
+*% Constraints
+*UIConstraints: *Option8 None *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *Option8 None
+*UIConstraints: *MediaType Transparency *InputSlot Internal
+*UIConstraints: *InputSlot Internal *MediaType Transparency
+*UIConstraints: *MediaType Labels *InputSlot Internal
+*UIConstraints: *InputSlot Internal *MediaType Labels
+*UIConstraints: *MediaType Envelope *InputSlot Internal
+*UIConstraints: *InputSlot Internal *MediaType Envelope
+*UIConstraints: *MediaType Vellum *InputSlot Internal
+*UIConstraints: *InputSlot Internal *MediaType Vellum
+*UIConstraints: *MediaType Cardstock *InputSlot Internal
+*UIConstraints: *InputSlot Internal *MediaType Cardstock
+*UIConstraints: *MediaType Transparency *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *MediaType Transparency
+*UIConstraints: *MediaType Labels *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *MediaType Labels
+*UIConstraints: *MediaType Envelope *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *MediaType Envelope
+*UIConstraints: *MediaType Vellum *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *MediaType Vellum
+*UIConstraints: *MediaType Cardstock *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *MediaType Cardstock
+*UIConstraints: *KCCollate *Option18 None
+*UIConstraints: *Option18 None *KCCollate Temp
+*UIConstraints: *PageSize A6 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize A6
+*UIConstraints: *PageRegion A6 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion A6
+*UIConstraints: *PageSize B6 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize B6
+*UIConstraints: *PageRegion B6 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion B6
+*UIConstraints: *PageSize EnvPersonal *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize EnvPersonal
+*UIConstraints: *PageRegion EnvPersonal *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion EnvPersonal
+*UIConstraints: *PageSize Env9 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize Env9
+*UIConstraints: *PageRegion Env9 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion Env9
+*UIConstraints: *PageSize Env10 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize Env10
+*UIConstraints: *PageRegion Env10 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion Env10
+*UIConstraints: *PageSize EnvMonarch *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize EnvMonarch
+*UIConstraints: *PageRegion EnvMonarch *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion EnvMonarch
+*UIConstraints: *PageSize EnvDL *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize EnvDL
+*UIConstraints: *PageRegion EnvDL *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion EnvDL
+*UIConstraints: *PageSize EnvC5 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize EnvC5
+*UIConstraints: *PageRegion EnvC5 *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion EnvC5
+*UIConstraints: *PageSize Statement *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageSize Statement
+*UIConstraints: *PageRegion Statement *InputSlot Internal
+*UIConstraints: *InputSlot Internal *PageRegion Statement
+*UIConstraints: *PageSize Executive *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize Executive
+*UIConstraints: *PageRegion Executive *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion Executive
+*UIConstraints: *PageSize A6 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize A6
+*UIConstraints: *PageRegion A6 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion A6
+*UIConstraints: *PageSize B6 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize B6
+*UIConstraints: *PageRegion B6 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion B6
+*UIConstraints: *PageSize EnvPersonal *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize EnvPersonal
+*UIConstraints: *PageRegion EnvPersonal *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion EnvPersonal
+*UIConstraints: *PageSize Env9 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize Env9
+*UIConstraints: *PageRegion Env9 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion Env9
+*UIConstraints: *PageSize Env10 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize Env10
+*UIConstraints: *PageRegion Env10 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion Env10
+*UIConstraints: *PageSize EnvMonarch *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize EnvMonarch
+*UIConstraints: *PageRegion EnvMonarch *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion EnvMonarch
+*UIConstraints: *PageSize EnvDL *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize EnvDL
+*UIConstraints: *PageRegion EnvDL *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion EnvDL
+*UIConstraints: *PageSize EnvC5 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize EnvC5
+*UIConstraints: *PageRegion EnvC5 *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion EnvC5
+*UIConstraints: *PageSize Statement *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize Statement
+*UIConstraints: *PageRegion Statement *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion Statement
+*UIConstraints: *PageSize P16K *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageSize P16K
+*UIConstraints: *PageRegion P16K *InputSlot PF17
+*UIConstraints: *InputSlot PF17 *PageRegion P16K
+*UIConstraints: *Duplex *PageSize Executive
+*UIConstraints: *PageSize Executive *Duplex DuplexTumble
+*UIConstraints: *PageSize Executive *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion Executive
+*UIConstraints: *PageRegion Executive *Duplex DuplexTumble
+*UIConstraints: *PageRegion Executive *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize A6
+*UIConstraints: *PageSize A6 *Duplex DuplexTumble
+*UIConstraints: *PageSize A6 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion A6
+*UIConstraints: *PageRegion A6 *Duplex DuplexTumble
+*UIConstraints: *PageRegion A6 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize ISOB5
+*UIConstraints: *PageSize ISOB5 *Duplex DuplexTumble
+*UIConstraints: *PageSize ISOB5 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion ISOB5
+*UIConstraints: *PageRegion ISOB5 *Duplex DuplexTumble
+*UIConstraints: *PageRegion ISOB5 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize B6
+*UIConstraints: *PageSize B6 *Duplex DuplexTumble
+*UIConstraints: *PageSize B6 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion B6
+*UIConstraints: *PageRegion B6 *Duplex DuplexTumble
+*UIConstraints: *PageRegion B6 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize EnvPersonal
+*UIConstraints: *PageSize EnvPersonal *Duplex DuplexTumble
+*UIConstraints: *PageSize EnvPersonal *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion EnvPersonal
+*UIConstraints: *PageRegion EnvPersonal *Duplex DuplexTumble
+*UIConstraints: *PageRegion EnvPersonal *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize Env9
+*UIConstraints: *PageSize Env9 *Duplex DuplexTumble
+*UIConstraints: *PageSize Env9 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion Env9
+*UIConstraints: *PageRegion Env9 *Duplex DuplexTumble
+*UIConstraints: *PageRegion Env9 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize Env10
+*UIConstraints: *PageSize Env10 *Duplex DuplexTumble
+*UIConstraints: *PageSize Env10 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion Env10
+*UIConstraints: *PageRegion Env10 *Duplex DuplexTumble
+*UIConstraints: *PageRegion Env10 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize EnvMonarch
+*UIConstraints: *PageSize EnvMonarch *Duplex DuplexTumble
+*UIConstraints: *PageSize EnvMonarch *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion EnvMonarch
+*UIConstraints: *PageRegion EnvMonarch *Duplex DuplexTumble
+*UIConstraints: *PageRegion EnvMonarch *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize EnvDL
+*UIConstraints: *PageSize EnvDL *Duplex DuplexTumble
+*UIConstraints: *PageSize EnvDL *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion EnvDL
+*UIConstraints: *PageRegion EnvDL *Duplex DuplexTumble
+*UIConstraints: *PageRegion EnvDL *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize EnvC5
+*UIConstraints: *PageSize EnvC5 *Duplex DuplexTumble
+*UIConstraints: *PageSize EnvC5 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion EnvC5
+*UIConstraints: *PageRegion EnvC5 *Duplex DuplexTumble
+*UIConstraints: *PageRegion EnvC5 *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize OficioII
+*UIConstraints: *PageSize OficioII *Duplex DuplexTumble
+*UIConstraints: *PageSize OficioII *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion OficioII
+*UIConstraints: *PageRegion OficioII *Duplex DuplexTumble
+*UIConstraints: *PageRegion OficioII *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize Folio
+*UIConstraints: *PageSize Folio *Duplex DuplexTumble
+*UIConstraints: *PageSize Folio *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion Folio
+*UIConstraints: *PageRegion Folio *Duplex DuplexTumble
+*UIConstraints: *PageRegion Folio *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize Statement
+*UIConstraints: *PageSize Statement *Duplex DuplexTumble
+*UIConstraints: *PageSize Statement *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion Statement
+*UIConstraints: *PageRegion Statement *Duplex DuplexTumble
+*UIConstraints: *PageRegion Statement *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageSize P16K
+*UIConstraints: *PageSize P16K *Duplex DuplexTumble
+*UIConstraints: *PageSize P16K *Duplex DuplexNoTumble
+*UIConstraints: *Duplex *PageRegion P16K
+*UIConstraints: *PageRegion P16K *Duplex DuplexTumble
+*UIConstraints: *PageRegion P16K *Duplex DuplexNoTumble
+
+*% Resolution 
+*OpenUI *Resolution/Resolution: PickOne
+*OrderDependency: 10 AnySetup *Resolution
+*DefaultResolution: 800dpi
+*Resolution 300dpi/300 dpi: "<< /HWResolution [300 300] >> setpagedevice"
+*Resolution 600dpi/600 dpi: "<< /HWResolution [600 600] >> setpagedevice"
+*Resolution 800dpi/Fast 1200 dpi: "<< /HWResolution [600 600] /PreRenderingEnhance true >> setpagedevice"
+*?Resolution: "save currentpagedevice /HWResolution get 0 get (      ) cvs print (dpi) = flush restore"
+*CloseUI: *Resolution
+
+*% Image Refinement 
+*OpenUI *Smoothing/KIR: PickOne
+*OrderDependency: 50 AnySetup *Smoothing
+*DefaultSmoothing: Medium
+*Smoothing None/Off: "0 statusdict /setdoret get exec"
+*Smoothing Medium/On: "2 statusdict /setdoret get exec"
+*?Smoothing: "
+  save
+  [(None)(Medium)(Medium)(Medium)]
+  statusdict /doret get exec {get} stopped
+  {pop pop (Unknown)} if
+  = flush restore"
+*End
+*CloseUI: *Smoothing
+
+*% Halftone Information 
+*DefaultHalftoneType: 1
+*ScreenFreq: "37.5"
+*ScreenAngle: "45.0"
+*ResScreenFreq 600dpi: "37.5"
+*ResScreenAngle 600dpi: "45.0"
+*ResScreenFreq 300dpi: "18.75"
+*ResScreenAngle 300dpi: "45.0"
+
+*DefaultScreenProc: Ellipse
+*ScreenProc Dot: "
+  {abs exch abs 2 copy add 1 gt
+  {1 sub dup mul exch 1 sub dup mul add 1 sub}
+  {dup mul exch dup mul add 1 exch sub} ifelse}"
+*End
+*ScreenProc Line: "{pop}"
+*ScreenProc Ellipse: "{dup 5 mul 8 div mul exch dup mul exch add sqrt 1 exch sub}"
+*DefaultTransfer: Null
+*Transfer Null: "{}"
+*Transfer Null.Inverse: "{1 exch sub}"
+
+*% Paper Handling 
+*% Page Size Definitions
+*OpenUI *PageSize: PickOne
+*OrderDependency: 40 AnySetup *PageSize
+*DefaultPageSize: A4
+*PageSize A4/A4: "<< /Policies << /PageSize 7 >> /PageSize [595 842] /ImagingBBox null >> setpagedevice"
+*PageSize A5/A5: "<< /Policies << /PageSize 7 >> /PageSize [420 595] /ImagingBBox null >> setpagedevice"
+*PageSize A6/A6: "<< /Policies << /PageSize 7 >> /PageSize [297 420] /ImagingBBox null >> setpagedevice"
+*PageSize B5/B5 (JIS): "<< /Policies << /PageSize 7 >> /PageSize [516 729] /ImagingBBox null >> setpagedevice"
+*PageSize ISOB5/B5 (ISO): "<< /Policies << /PageSize 7 >> /PageSize [499 709] /ImagingBBox null >> setpagedevice"
+*PageSize B6/B6: "<< /Policies << /PageSize 7 >> /PageSize [363 516] /ImagingBBox null >> setpagedevice"
+*PageSize OficioII/Oficio II: "<< /Policies << /PageSize 7 >> /PageSize [612 936] /ImagingBBox null >> setpagedevice"
+*PageSize Folio/8.5X13 (Folio): "<< /Policies << /PageSize 7 >> /PageSize [595 935] /ImagingBBox null >> setpagedevice"
+*PageSize Statement/Statement: "<< /Policies << /PageSize 7 >> /PageSize [396 612] /ImagingBBox null >> setpagedevice"
+*PageSize P16K/16K: "<< /Policies << /PageSize 7 >> /PageSize [558 774] /ImagingBBox null >> setpagedevice"
+*PageSize Letter/Letter: "<< /Policies << /PageSize 7 >> /PageSize [612 792] /ImagingBBox null >> setpagedevice"
+*PageSize Legal/Legal: "<< /Policies << /PageSize 7 >> /PageSize [612 1008] /ImagingBBox null >> setpagedevice"
+*PageSize Executive/Executive: "<< /Policies << /PageSize 7 >> /PageSize [522 756] /ImagingBBox null >> setpagedevice"
+*PageSize EnvPersonal/Envelope #6: "<< /Policies << /PageSize 7 >> /PageSize [261 468] /ImagingBBox null >> setpagedevice"
+*PageSize Env9/Envelope #9: "<< /Policies << /PageSize 7 >> /PageSize [279 639] /ImagingBBox null >> setpagedevice"
+*PageSize Env10/Envelope #10: "<< /Policies << /PageSize 7 >> /PageSize [297 684] /ImagingBBox null >> setpagedevice"
+*PageSize EnvMonarch/Envelope Monarch: "<< /Policies << /PageSize 7 >> /PageSize [279 540] /ImagingBBox null >> setpagedevice"
+*PageSize EnvDL/Envelope DL: "<< /Policies << /PageSize 7 >> /PageSize [312 624] /ImagingBBox null >> setpagedevice"
+*PageSize EnvC5/Envelope C5: "<< /Policies << /PageSize 7 >> /PageSize [459 649] /ImagingBBox null >> setpagedevice"
+*?PageSize: "
+  save
+  currentpagedevice /PageSize get aload pop
+  2 copy gt {exch} if
+  (Unknown)
+  19 dict
+  dup [595 842] (A4) put
+  dup [420 595] (A5) put
+  dup [297 420] (A6) put
+  dup [516 729] (B5) put
+  dup [499 709] (ISOB5) put
+  dup [363 516] (B6) put
+  dup [612 936] (OficioII) put
+  dup [595 935] (Folio) put
+  dup [396 612] (Statement) put
+  dup [558 774] (P16K) put
+  dup [612 792] (Letter) put
+  dup [612 1008] (Legal) put
+  dup [522 756] (Executive) put
+  dup [261 468] (EnvPersonal) put
+  dup [279 639] (Env9) put
+  dup [297 684] (Env10) put
+  dup [279 540] (EnvMonarch) put
+  dup [312 624] (EnvDL) put
+  dup [459 649] (EnvC5) put
+  {exch aload pop 4 index sub abs 5 le exch
+    5 index sub abs 5 le and
+    {exch pop exit}{pop} ifelse
+  } bind forall
+  = flush pop pop restore "
+*End
+*CloseUI: *PageSize
+
+*% Page Region Definitions for Frame Buffer
+*OpenUI *PageRegion: PickOne
+*OrderDependency: 40 AnySetup *PageRegion
+*DefaultPageRegion: A4
+*PageRegion A4/A4: "<< /Policies << /PageSize 7 >> /PageSize [595 842] /ImagingBBox null >> setpagedevice"
+*PageRegion A5/A5: "<< /Policies << /PageSize 7 >> /PageSize [420 595] /ImagingBBox null >> setpagedevice"
+*PageRegion A6/A6: "<< /Policies << /PageSize 7 >> /PageSize [297 420] /ImagingBBox null >> setpagedevice"
+*PageRegion B5/B5 (JIS): "<< /Policies << /PageSize 7 >> /PageSize [516 729] /ImagingBBox null >> setpagedevice"
+*PageRegion ISOB5/B5 (ISO): "<< /Policies << /PageSize 7 >> /PageSize [499 709] /ImagingBBox null >> setpagedevice"
+*PageRegion B6/B6: "<< /Policies << /PageSize 7 >> /PageSize [363 516] /ImagingBBox null >> setpagedevice"
+*PageRegion Letter/Letter: "<< /Policies << /PageSize 7 >> /PageSize [612 792] /ImagingBBox null >> setpagedevice"
+*PageRegion Legal/Legal: "<< /Policies << /PageSize 7 >> /PageSize [612 1008] /ImagingBBox null >> setpagedevice"
+*PageRegion Executive/Executive: "<< /Policies << /PageSize 7 >> /PageSize [522 756] /ImagingBBox null >> setpagedevice"
+*PageRegion EnvPersonal/Envelope #6: "<< /Policies << /PageSize 7 >> /PageSize [261 468] /ImagingBBox null >> setpagedevice"
+*PageRegion Env9/Envelope #9: "<< /Policies << /PageSize 7 >> /PageSize [279 639] /ImagingBBox null >> setpagedevice"
+*PageRegion Env10/Envelope #10: "<< /Policies << /PageSize 7 >> /PageSize [297 684] /ImagingBBox null >> setpagedevice"
+*PageRegion EnvMonarch/Envelope Monarch: "<< /Policies << /PageSize 7 >> /PageSize [279 540] /ImagingBBox null >> setpagedevice"
+*PageRegion EnvDL/Envelope DL: "<< /Policies << /PageSize 7 >> /PageSize [312 624] /ImagingBBox null >> setpagedevice"
+*PageRegion EnvC5/Envelope C5: "<< /Policies << /PageSize 7 >> /PageSize [459 649] /ImagingBBox null >> setpagedevice"
+*PageRegion OficioII/Oficio II: "<< /Policies << /PageSize 7 >> /PageSize [612 936] /ImagingBBox null >> setpagedevice"
+*PageRegion Folio/8.5X13 (Folio): "<< /Policies << /PageSize 7 >> /PageSize [595 935] /ImagingBBox null >> setpagedevice"
+*PageRegion Statement/Statement: "<< /Policies << /PageSize 7 >> /PageSize [396 612] /ImagingBBox null >> setpagedevice"
+*PageRegion P16K/16K: "<< /Policies << /PageSize 7 >> /PageSize [558 774] /ImagingBBox null >> setpagedevice"
+*CloseUI: *PageRegion
+
+*% Imageable Area Definitions
+*DefaultImageableArea: A4
+*ImageableArea A4/A4: "12 10 583 832"
+*ImageableArea A5/A5: "12 12 409 585"
+*ImageableArea A6/A6: "12 10 285 411"
+*ImageableArea B5/B5 (JIS): "21 10 495 719"
+*ImageableArea ISOB5/B5 (ISO): "12 12 487 696"
+*ImageableArea B6/B6: "12 10 352 506"
+*ImageableArea OficioII/Oficio II: "12 12 600 924"
+*ImageableArea Folio/8.5X13 (Folio): "12 12 571 911"
+*ImageableArea Statement/Statement: "12 12 384 600"
+*ImageableArea P16K/16K: "12 12 546 762"
+*ImageableArea Letter/Letter: "12 08 600 784"
+*ImageableArea Legal/Legal: "12 08 600 1000"
+*ImageableArea Executive/Executive: "12 08 510 748"
+*ImageableArea EnvPersonal/Envelope #6: "12 08 237 452"
+*ImageableArea Env9/Envelope #9: "12 08 255 623"
+*ImageableArea Env10/Envelope #10: "12 08 273 668"
+*ImageableArea EnvMonarch/Envelope Monarch: "12 08 255 524"
+*ImageableArea EnvDL/Envelope DL: "12 10 288 604"
+*ImageableArea EnvC5/Envelope C5: "12 10 435 629"
+*?ImageableArea: "
+  save
+  /cvp {cvi (                   ) cvs
+  print ( ) print} bind def
+  newpath clippath pathbbox
+  4 -2 roll exch 2 {ceiling cvp} repeat
+  exch 2 {floor cvp} repeat ( )
+  = flush restore"
+*End
+
+*% Physical Dimensions of Media
+*DefaultPaperDimension: A4
+*PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
+*PaperDimension A6/A6: "297 420"
+*PaperDimension B5/B5 (JIS): "516 729"
+*PaperDimension ISOB5/B5 (ISO): "499 709"
+*PaperDimension B6/B6: "363 516"
+*PaperDimension OficioII/Oficio II: "612 936"
+*PaperDimension Folio/8.5X13 (Folio): "595 935"
+*PaperDimension Statement/Statement: "396 612"
+*PaperDimension P16K/16K: "558 774"
+*PaperDimension Letter/Letter: "612 792"
+*PaperDimension Legal/Legal: "612 1008"
+*PaperDimension Executive/Executive: "522 756"
+*PaperDimension EnvPersonal/Envelope #6: "261 468"
+*PaperDimension Env9/Envelope #9: "279 639"
+*PaperDimension Env10/Envelope #10: "297 684"
+*PaperDimension EnvMonarch/Envelope Monarch: "279 540"
+*PaperDimension EnvDL/Envelope DL: "312 624"
+*PaperDimension EnvC5/Envelope C5: "459 649"
+
+*% Input Slot Definitions
+*OpenUI *InputSlot: PickOne
+*OrderDependency: 30 AnySetup *InputSlot
+*DefaultInputSlot: Internal
+*InputSlot Internal/Cassette 1 (Internal): "<</ManualFeed false>> setpagedevice statusdict begin 0 setpapertray end"
+*InputSlot PF17/Cassette 2: "<</ManualFeed false>> setpagedevice statusdict begin 1 setpapertray end"
+*InputSlot MF1/Multi Purpose Feeder: "currentpagedevice /InputAttributes get 3 get null eq
+{ <</ManualFeed true>> setpagedevice }{ statusdict begin 3 setpapertray end } ifelse"
+*End
+*InputSlot MF/Manual Feed: "<< /ManualFeed true >> setpagedevice"
+*?InputSlot: ""
+*CloseUI: *InputSlot
+
+*% MediaType Definitions
+*OpenUI *MediaType: PickOne
+*OrderDependency: 100 AnySetup *MediaType
+*DefaultMediaType: PrnDef
+*MediaType PrnDef/Printer Default: ""
+*MediaType Plain/Plain Paper: "<</ManualFeed false /MediaType (Plain) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Transparency/Transparency: "<</ManualFeed false /MediaType (Transparency) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Labels/Labels: "<</ManualFeed false /MediaType (Labels) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Letterhead/Letterhead: "<</ManualFeed false /MediaType (Letterhead) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Bond/Bond: "<</ManualFeed false /MediaType (Bond) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Color/Color: "<</ManualFeed false /MediaType (Color) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Preprinted/Preprinted: "<</ManualFeed false /MediaType (Preprinted) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Prepunched/Prepunched: "<</ManualFeed false /MediaType (Prepunched) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Recycled/Recycled: "<</ManualFeed false /MediaType (Recycled) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Rough/Rough: "<</ManualFeed false /MediaType (Rough) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Cardstock/Cardstock: "<</ManualFeed false /MediaType (Card Stock) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Vellum/Vellum: "<</ManualFeed false /MediaType (Vellum) /DeferredMediaSelection true >> setpagedevice"
+*MediaType Envelope/Envelope: "<</ManualFeed false /MediaType (Envelope) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User1/Custom 1: "<</ManualFeed false /MediaType (Custom Type1) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User2/Custom 2: "<</ManualFeed false /MediaType (Custom Type2) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User3/Custom 3: "<</ManualFeed false /MediaType (Custom Type3) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User4/Custom 4: "<</ManualFeed false /MediaType (Custom Type4) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User5/Custom 5: "<</ManualFeed false /MediaType (Custom Type5) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User6/Custom 6: "<</ManualFeed false /MediaType (Custom Type6) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User7/Custom 7: "<</ManualFeed false /MediaType (Custom Type7) /DeferredMediaSelection true >> setpagedevice"
+*MediaType User8/Custom 8: "<</ManualFeed false /MediaType (Custom Type8) /DeferredMediaSelection true >> setpagedevice"
+*?MediaType: "
+  save
+    currentpagedevice /MediaType {get} stopped
+    {pop pop (Unknown)} {dup null eq {pop (Unknown)} if} ifelse = flush
+  restore"
+*End
+*CloseUI: *MediaType
+
+*RequiresPageRegion All: True
+*% Duplex Definitions
+*OpenUI *Duplex/Duplexing: PickOne
+*OrderDependency: 50 AnySetup *Duplex
+*DefaultDuplex: None
+*Duplex None/None: "statusdict begin false setduplexmode false settumble end"
+*Duplex DuplexTumble/Short Edge: "statusdict begin true setduplexmode true settumble end"
+*Duplex DuplexNoTumble/Long Edge: "statusdict begin true setduplexmode false settumble end"
+*?Duplex: "
+  save
+  statusdict begin
+  duplexmode
+  {tumble {(DuplexTumble)}{(DuplexNoTumble)} ifelse}
+  {(None)} ifelse
+  = flush end restore"
+*End
+*CloseUI: *Duplex
+
+*% Job Spooling Definitions
+*OpenUI *KCCollate/Job Settings: PickOne
+*OrderDependency: 20 AnySetup *KCCollate
+*DefaultKCCollate: None
+*KCCollate None/None: ""
+*KCCollate Temp/Temporary: "
+  userdict /UICollateDetails known not {userdict /UICollateDetails 10 dict put} if
+  userdict /UICollateDetails get /Mode 0 put <</Collate true /CollateDetails UICollateDetails>> setpagedevice"
+*End
+*?KCCollate: "
+  save
+  currentpagedevice dup /Collate known {
+    dup /CollateDetails known {
+      /CollateDetails get
+      dup /Mode known {
+        /Mode get
+        1 {
+          dup 0 eq {pop (Temp) exit} if
+          pop (Unknown)
+        } repeat
+      }{pop (Unknown)} ifelse
+    }{pop (Unknown)} ifelse
+  }{pop (Unknown)} ifelse
+  = flush restore"
+*End
+*CloseUI: *KCCollate
+
+*% PPD Version Info 
+*OpenUI *KMVersion/PPD Version: PickOne
+*OrderDependency: 25 AnySetup *KMVersion
+*DefaultKMVersion: Default
+*KMVersion Default/8.2.0111 [01-11-2005]: "
+globaldict /ct_AddStdCIDMap known {
+globaldict /ct_AddStdCIDMap get  length 7 eq
+{globaldict /ct_AddStdCIDMap get  0 get type /stringtype eq
+{globaldict /ct_AddStdCIDMap get  1 get 0 eq
+{globaldict /ct_AddStdCIDMap get  2 get () eq
+{globaldict /ct_AddStdCIDMap get  3 get /SubFileDecode eq
+{globaldict /ct_AddStdCIDMap get  4 get systemdict /filter get eq
+{currentglobal true setglobal globaldict
+/ct_AddStdCIDMap
+globaldict /ct_AddStdCIDMap get dup
+globaldict /ct_AddStdCIDMap get
+0 get length 1 exch
+put put setglobal
+} if} if} if} if} if} if} if"
+*End
+*CloseUI: *KMVersion
+
+*% Font Information
+*DefaultFont: Courier
+*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM
+*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM
+*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM
+*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM
+*Font Bookman-Light: Standard "(001.004S)" Standard ROM
+*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM
+*Font Bookman-Demi: Standard "(001.004S)" Standard ROM
+*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM
+*Font Courier: Standard "(002.004S)" Standard ROM
+*Font Courier-Oblique: Standard "(002.004S)" Standard ROM
+*Font Courier-Bold: Standard "(002.004S)" Standard ROM
+*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM
+*Font Helvetica: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM
+*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM
+*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM
+*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM
+*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM
+*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM
+*Font Palatino-Roman: Standard "(001.005S)" Standard ROM
+*Font Palatino-Italic: Standard "(001.005S)" Standard ROM
+*Font Palatino-Bold: Standard "(001.005S)" Standard ROM
+*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM
+*Font Symbol: Special "(001.007S)" Special ROM
+*Font Times-Roman: Standard "(001.007S)" Standard ROM
+*Font Times-Italic: Standard "(001.007S)" Standard ROM
+*Font Times-Bold: Standard "(001.007S)" Standard ROM
+*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM
+*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
+*Font ZapfDingbats: Special "(001.004S)" Special ROM
+*?FontQuery: "
+  save
+  /str 100 string dup 0 (fonts/) putinterval def
+  {count 1 gt
+    { exch dup str 6 94 getinterval cvs
+      (/) print print (:) print
+      FontDirectory exch known
+      {(Yes)}{(No)} ifelse =
+    }{exit} ifelse
+  } bind loop (*)
+  = flush restore"
+*End
+*?FontList: "save FontDirectory { pop == } bind forall flush (*) = flush restore"
+*% Printer Messages
+*Message: "%%[ exitserver: permanent state may be changed ]%%"
+*Message: "%%[ Flushing: rest of job (to end-of-file) will be ignored ]%%"
+*Message: "\FontName\ not found, using Courier"
+
+*% Status (format: %%[ status: <one of these> ]%% )
+*Status: "warming up"/warming up
+*Status: "idle"/idle
+*Status: "busy"/busy
+*Status: "waiting"/waiting
+*Status: "printing"/printing
+*Status: "initializing"/initializing
+*Status: "printing test page"/printing test page
+*% Printer Error (format: %%[ PrinterError: <one of these> ]%% )
+*PrinterError: "paper entry misfeed"
+*PrinterError: "cover open"
+*PrinterError: "no paper tray"
+*PrinterError: "out of paper"
+*PrinterError: "toner low (halt)"
+*PrinterError: "warming up"
+*PrinterError: "other reason"
+*PrinterError: "video interface mode"
+*PrinterError: "offline"
+*PrinterError: "toner low (warning)"
+
+*% Input Sources (format: %%[ status: <stat>;source:<one of these> ]%% )
+*Source: "Serial"
+*Source: "Parallel"
+*Source: "LocalTalk"
+*Source: "Option"
+
+*%  End of PPD file for Kyocera Mita FS-1020D (English)
diff --git a/cups/printers.conf b/cups/printers.conf

index af7218b9732a8a439fb4bcaf83f292ede1c0c779..af7c292efdae57e48cc2a79dd04cca81dd093dbe 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -9,7 +9,7 @@ MakeModel Kyocera Mita FS-1020D
  DeviceURI usb://Kyocera/FS-1020D?serial=XAX5991704
  State Idle
  StateTime 1589725064
-ConfigTime 1589725004
+ConfigTime 1595324176
  Type 8392788
  Accepting Yes
  Shared Yes
diff --git a/cups/printers.conf.O b/cups/printers.conf.O

index 1548990ec3cc0bdbbecc2646b64eefe4f5159544..af7218b9732a8a439fb4bcaf83f292ede1c0c779 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -48,23 +48,3 @@ Attribute marker-names Cyan Cartridge HP CF401A,Magenta Cartridge HP CF403A,Yell
  Attribute marker-types toner,toner,toner,toner
  Attribute marker-change-time 1589724004
  </Printer>
-<Printer HP_Color_LaserJet_MFP_M277dw_28CAA8_>
-UUID urn:uuid:adc67122-ace3-3bdd-7578-7b167c070926
-Info 
-Location 
-MakeModel Color LaserJet MFP M277dw
-DeviceURI ipps://NPI28CAA8.local:443/ipp/print
-State Idle
-StateTime 1593540435
-ConfigTime 1593540437
-Type 4188
-Accepting Yes
-Shared No
-JobSheets none none
-QuotaPeriod 0
-PageLimit 0
-KLimit 0
-OpPolicy default
-ErrorPolicy retry-job
-Option cups-browsed true
-</Printer>
diff --git a/dbus-1/system.d/com.redhat.NewPrinterNotification.conf b/dbus-1/system.d/com.redhat.NewPrinterNotification.conf

index 912cbcd4c20cb861a6038cf72f22125b3a1a9e43..4ef92e370e8e1b2f1daabf013f36fd5f59e85931 100644 (file)
--- a/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
+++ b/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
@@ -2,27 +2,16 @@
   "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
   "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
  <busconfig>
-       <policy at_console="true">
-               <allow own="com.redhat.NewPrinterNotification"/>
-       </policy>
-
-       <policy user="root">
-               <allow own="com.redhat.NewPrinterNotification"/>
-       </policy>
-
         <policy user="root">
                 <allow send_destination="com.redhat.NewPrinterNotification"
                        send_interface="com.redhat.NewPrinterNotification"/>
         </policy>
  
         <policy context="default">
-               <deny own="com.redhat.NewPrinterNotification"/>
+               <allow own="com.redhat.NewPrinterNotification"/>
  
                 <deny send_destination="com.redhat.NewPrinterNotification"
                       send_interface="com.redhat.NewPrinterNotification"/>
-       </policy>
-
-       <policy context="default">
                 <allow send_destination="com.redhat.NewPrinterNotification"
                        send_interface="org.freedesktop.DBus.Introspectable" />
                 <allow send_destination="com.redhat.NewPrinterNotification"
diff --git a/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf b/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf

index d5e5c543906055705243d90d2b442fdc4b8d0518..e3ffb2fa2b6a11935564242353d4d7483c1823b7 100644 (file)
--- a/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
+++ b/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
@@ -2,27 +2,16 @@
   "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
   "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
  <busconfig>
-       <policy at_console="true">
-               <allow own="com.redhat.PrinterDriversInstaller"/>
-       </policy>
-
-       <policy user="root">
-               <allow own="com.redhat.PrinterDriversInstaller"/>
-       </policy>
-
         <policy user="root">
                 <allow send_destination="com.redhat.PrinterDriversInstaller"
                        send_interface="com.redhat.PrinterDriversInstaller"/>
         </policy>
  
         <policy context="default">
-               <deny own="com.redhat.PrinterDriversInstaller"/>
+               <allow own="com.redhat.PrinterDriversInstaller"/>
  
                 <deny send_destination="com.redhat.PrinterDriversInstaller"
                       send_interface="com.redhat.PrinterDriversInstaller"/>
-       </policy>
-
-       <policy context="default">
                 <allow send_destination="com.redhat.PrinterDriversInstaller"
                        send_interface="org.freedesktop.DBus.Introspectable" />
                 <allow send_destination="com.redhat.PrinterDriversInstaller"
diff --git a/dbus-1/system.d/nm-openvpn-service.conf b/dbus-1/system.d/nm-openvpn-service.conf

deleted file mode 100644 (file)

index 243ab48..0000000
--- a/dbus-1/system.d/nm-openvpn-service.conf
+++ /dev/null
@@ -1,14 +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>
-       <policy user="root">
-               <allow own_prefix="org.freedesktop.NetworkManager.openvpn"/>
-               <allow send_destination="org.freedesktop.NetworkManager.openvpn"/>
-       </policy>
-       <policy context="default">
-               <deny own_prefix="org.freedesktop.NetworkManager.openvpn"/>
-               <deny send_destination="org.freedesktop.NetworkManager.openvpn"/>
-       </policy>
-</busconfig>
-
diff --git a/dbus-1/system.d/nm-pptp-service.conf b/dbus-1/system.d/nm-pptp-service.conf

deleted file mode 100644 (file)

index cb4406d..0000000
--- a/dbus-1/system.d/nm-pptp-service.conf
+++ /dev/null
@@ -1,15 +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>
-       <policy user="root">
-               <allow own_prefix="org.freedesktop.NetworkManager.pptp"/>
-               <allow send_destination="org.freedesktop.NetworkManager.pptp"/>
-               <allow send_interface="org.freedesktop.NetworkManager.pptp.ppp"/>
-       </policy>
-       <policy context="default">
-               <deny own_prefix="org.freedesktop.NetworkManager.pptp"/>
-               <deny send_destination="org.freedesktop.NetworkManager.pptp"/>
-       </policy>
-</busconfig>
-
diff --git a/dbus-1/system.d/org.freedesktop.GeoClue2.conf b/dbus-1/system.d/org.freedesktop.GeoClue2.conf

index 1de081683ef6a59d5e24b25023adef39f43e7ebb..abb3d5eefff4f0ccf6f5c766f3d4715fe6905a64 100644 (file)
--- a/dbus-1/system.d/org.freedesktop.GeoClue2.conf
+++ b/dbus-1/system.d/org.freedesktop.GeoClue2.conf
@@ -26,6 +26,11 @@
  
      <allow send_destination="fi.w1.wpa_supplicant1"
             send_interface="org.freedesktop.DBus.Introspectable"/>
+
+    <allow send_destination="fi.w1.wpa_supplicant1"
+           send_interface="fi.w1.wpa_supplicant1.Interface"
+           send_type="method_call"
+           send_member="Scan"/>
    </policy>
  
    <policy user="root">
diff --git a/dbus-1/system.d/org.freedesktop.ModemManager1.conf b/dbus-1/system.d/org.freedesktop.ModemManager1.conf

index 14240ea09339e7fe404c9bb70a093fe1d82c26c1..8087da6f21b1fbed8ab53acf667f10a45693ff07 100644 (file)
--- a/dbus-1/system.d/org.freedesktop.ModemManager1.conf
+++ b/dbus-1/system.d/org.freedesktop.ModemManager1.conf
@@ -51,6 +51,10 @@
             send_interface="org.freedesktop.ModemManager1.Modem"
             send_member="DeleteBearer"/>
  
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem"
+           send_member="SetPowerState"/>
+
      <allow send_destination="org.freedesktop.ModemManager1"
             send_interface="org.freedesktop.ModemManager1.Modem"
             send_member="Reset"/>
@@ -61,16 +65,30 @@
  
      <allow send_destination="org.freedesktop.ModemManager1"
             send_interface="org.freedesktop.ModemManager1.Modem"
-           send_member="SetAllowedModes"/>
+           send_member="SetCurrentCapabilities"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem"
+           send_member="SetCurrentModes"/>
  
      <allow send_destination="org.freedesktop.ModemManager1"
             send_interface="org.freedesktop.ModemManager1.Modem"
-           send_member="SetBands"/>
+           send_member="SetCurrentBands"/>
  
      <allow send_destination="org.freedesktop.ModemManager1"
             send_interface="org.freedesktop.ModemManager1.Modem"
             send_member="Command"/>
  
+    <!-- org.freedesktop.ModemManager1.Modem.Firmware.xml -->
+
+    <!-- Protected by the Device.Control policy rule -->
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Firmware"
+           send_member="List"/>
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Firmware"
+           send_member="Select"/>
+
      <!-- org.freedesktop.ModemManager1.Modem.Simple.xml -->
  
      <!-- Allowed for everyone -->
@@ -98,6 +116,14 @@
             send_interface="org.freedesktop.ModemManager1.Modem.Modem3gpp"
             send_member="Scan"/>
  
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Modem3gpp"
+           send_member="SetEpsUeModeOperation"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Modem3gpp"
+           send_member="SetInitialEpsBearerSettings"/>
+
      <!-- org.freedesktop.ModemManager1.Modem.ModemCdma.xml -->
  
      <!-- Protected by the Device.Control policy rule -->
@@ -109,6 +135,25 @@
             send_interface="org.freedesktop.ModemManager1.Modem.ModemCdma"
             send_member="ActivateManual"/>
  
+    <!-- org.freedesktop.ModemManager1.Modem.Oma.xml -->
+
+    <!-- Protected by the Device.Control policy rule -->
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Oma"
+           send_member="Setup"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Oma"
+           send_member="StartClientInitiatedSession"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Oma"
+           send_member="AcceptNetworkInitiatedSession"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Oma"
+           send_member="CancelSession"/>
+
      <!-- org.freedesktop.ModemManager1.Sim.xml -->
  
      <!-- Protected by the Device.Control policy rule -->
@@ -165,6 +210,10 @@
             send_interface="org.freedesktop.ModemManager1.Modem.Location"
             send_member="SetSuplServer"/>
  
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Location"
+           send_member="InjectAssistanceData"/>
+
      <allow send_destination="org.freedesktop.ModemManager1"
             send_interface="org.freedesktop.ModemManager1.Modem.Location"
             send_member="SetGpsRefreshRate"/>
@@ -217,6 +266,30 @@
             send_interface="org.freedesktop.ModemManager1.Modem.Voice"
             send_member="DeleteCall"/>
  
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Voice"
+           send_member="HoldAndAccept"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Voice"
+           send_member="HangupAndAccept"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Voice"
+           send_member="HangupAll"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Voice"
+           send_member="Transfer"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Voice"
+           send_member="CallWaitingSetup"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Voice"
+           send_member="CallWaitingQuery"/>
+
      <!-- org.freedesktop.ModemManager1.Call.xml -->
  
      <!-- Protected by the Voice policy rule -->
@@ -228,6 +301,18 @@
             send_interface="org.freedesktop.ModemManager1.Call"
             send_member="Accept"/>
  
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Call"
+           send_member="Deflect"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Call"
+           send_member="JoinMultiparty"/>
+
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Call"
+           send_member="LeaveMultiparty"/>
+
      <allow send_destination="org.freedesktop.ModemManager1"
             send_interface="org.freedesktop.ModemManager1.Call"
             send_member="Hangup"/>
@@ -238,11 +323,18 @@
  
      <!-- org.freedesktop.ModemManager1.Modem.Signal.xml -->
  
-    <!-- Allowed for everyone -->
+    <!-- Protected by the Device.Control policy rule -->
      <allow send_destination="org.freedesktop.ModemManager1"
             send_interface="org.freedesktop.ModemManager1.Modem.Signal"
             send_member="Setup"/>
  
+    <!-- org.freedesktop.ModemManager1.Modem.Time.xml -->
+
+    <!-- Protected by the Time policy rule -->
+    <allow send_destination="org.freedesktop.ModemManager1"
+           send_interface="org.freedesktop.ModemManager1.Modem.Time"
+           send_member="GetNetworkTime"/>
+
    </policy>
  
    <policy user="root">
diff --git a/dbus-1/system.d/org.freedesktop.RealtimeKit1.conf b/dbus-1/system.d/org.freedesktop.RealtimeKit1.conf

deleted file mode 100644 (file)

index c8d4eb5..0000000
--- a/dbus-1/system.d/org.freedesktop.RealtimeKit1.conf
+++ /dev/null
@@ -1,31 +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>
-
-  <policy user="rtkit">
-    <allow own="org.freedesktop.RealtimeKit1"/>
-  </policy>
-
-  <policy user="root">
-    <allow own="org.freedesktop.RealtimeKit1"/>
-  </policy>
-
-  <policy context="default">
-    <allow send_destination="org.freedesktop.RealtimeKit1"/>
-    <allow receive_sender="org.freedesktop.RealtimeKit1"/>
-
-    <deny send_destination="org.freedesktop.RealtimeKit1"
-          send_interface="org.freedesktop.RealtimeKit1" send_member="Exit"/>
-    <deny send_destination="org.freedesktop.RealtimeKit1"
-          send_interface="org.freedesktop.RealtimeKit1" send_member="ResetKnown"/>
-    <deny send_destination="org.freedesktop.RealtimeKit1"
-          send_interface="org.freedesktop.RealtimeKit1" send_member="ResetAll"/>
-  </policy>
-
-  <policy user="root">
-    <allow send_destination="org.freedesktop.RealtimeKit1"/>
-    <allow receive_sender="org.freedesktop.RealtimeKit1"/>
-  </policy>
-
-</busconfig>
diff --git a/dbus-1/system.d/org.freedesktop.UDisks2.conf b/dbus-1/system.d/org.freedesktop.UDisks2.conf

deleted file mode 100644 (file)

index 7e176d3..0000000
--- a/dbus-1/system.d/org.freedesktop.UDisks2.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
-
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- Only root can own the service -->
-  <policy user="root">
-    <allow own="org.freedesktop.UDisks2"/>
-  </policy>
-
-  <!-- Anyone can send messages to the owner of org.freedesktop.UDisks2 -->
-  <policy context="default">
-    <allow send_destination="org.freedesktop.UDisks2"/>
-  </policy>
-</busconfig>
diff --git a/dbus-1/system.d/org.freedesktop.UPower.conf b/dbus-1/system.d/org.freedesktop.UPower.conf

deleted file mode 100644 (file)

index 5a6c660..0000000
--- a/dbus-1/system.d/org.freedesktop.UPower.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
-
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- Only root can own the service -->
-  <policy user="root">
-    <allow own="org.freedesktop.UPower"/>
-  </policy>
-  <policy context="default">
-
-    <allow send_destination="org.freedesktop.UPower"
-           send_interface="org.freedesktop.DBus.Introspectable"/>
-
-    <allow send_destination="org.freedesktop.UPower"
-           send_interface="org.freedesktop.DBus.Peer"/>
-    <allow send_destination="org.freedesktop.UPower"
-           send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.freedesktop.UPower.Device"
-           send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.freedesktop.UPower.KbdBacklight"
-           send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.freedesktop.UPower.Wakeups"
-           send_interface="org.freedesktop.DBus.Properties"/>
-
-    <allow send_destination="org.freedesktop.UPower"
-           send_interface="org.freedesktop.UPower"/>
-    <allow send_destination="org.freedesktop.UPower"
-           send_interface="org.freedesktop.UPower.Device"/>
-    <allow send_destination="org.freedesktop.UPower"
-           send_interface="org.freedesktop.UPower.KbdBacklight"/>
-    <allow send_destination="org.freedesktop.UPower"
-          send_interface="org.freedesktop.UPower.Wakeups"/>
-  </policy>
-</busconfig>
diff --git a/default/anacron b/default/anacron

index 40e0494e130fb959235c10f4a32ba350966e9e41..bf6e0bae9c96c9fb5cf30f94f1016c03793f9907 100644 (file)
--- a/default/anacron
+++ b/default/anacron
@@ -1,6 +1,25 @@
+# Environment File for anacron
+
+# ANACRON_RUN_ON_BATTERY_POWER
+#
+# NOTE:
+#       For ANACRON_RUN_ON_BATTERY_POWER, settings here only works
+#       when you are not using systemd.
+#       Please read /usr/share/doc/anacron/README.Debian
+#       to see how to adjust program behaviour on AC power.
+#
  # If set to "yes", start anacron even when on battery power.  By
  # default, the /etc/init.d/anacron script tries to avoid running
  # anacron unless on AC power, so as to avoid running down the battery.
  # (Things like the locate updatedb cause a lot of I/O.)
  
  ANACRON_RUN_ON_BATTERY_POWER=no
+
+# ANACRON_ARGS
+#
+# Arguments/options to pass to anacron.
+# By default, "-s" is used to ensure serialised job arrangements.
+# If you want tasks to execute in parallel when the jobs are due to
+# start, do not pass "-s" here.
+
+ANACRON_ARGS=-s
diff --git a/default/aufs b/default/aufs

index 9e49537659cabe855279be7c44f933e7c65d83cb..58cf2670a6945a89b839671a9192c3b4dab13813 100644 (file)
--- a/default/aufs
+++ b/default/aufs
@@ -1,5 +1,5 @@
  # aufs variables for shell scripts
-AUFS_VERSION=4.13-20170911
+AUFS_VERSION=5.x-rcN-20191021
  AUFS_SUPER_MAGIC=1635083891
  AUFS_SUPER_MAGIC_HEX=0x61756673
  AUFS_ROOT_INO=2
diff --git a/default/bridge-utils b/default/bridge-utils

index 4d5ed5db18851b01d332d0535aabd5b89569a953..caa20da9baabb756ef238451ffaf9bbf5c931d0f 100644 (file)
--- a/default/bridge-utils
+++ b/default/bridge-utils
@@ -1,4 +1,4 @@
  # /etc/default/bridge-utils
  
  # Shoud we add the ports of a bridge to the bridge when they are hotplugged?
-BRIDGE_HOTPLUG=yes
+BRIDGE_HOTPLUG=no
diff --git a/default/cryptdisks b/default/cryptdisks

index 223d7b706711dd7431a125af9b39ef8e5f22f6a6..c1f837cef7ea6ecd07bcc1d195e55b52efeeec71 100644 (file)
--- a/default/cryptdisks
+++ b/default/cryptdisks
@@ -10,8 +10,3 @@ CRYPTDISKS_MOUNT=""
  # Default check script. Takes effect, if the 'check' option is set in crypttab
  # without a value.
  CRYPTDISKS_CHECK=blkid
-
-# Default precheck script. Takes effect, if the 'precheck' option is set in
-# crypttab without a value.
-# Default is 'un_blkid' for plain dm-crypt devices if unset here.
-CRYPTDISKS_PRECHECK=
diff --git a/default/ebtables b/default/ebtables

deleted file mode 100644 (file)

index 9411ae0..0000000
--- a/default/ebtables
+++ /dev/null
@@ -1,35 +0,0 @@
-# Unload modules on restart and stop
-#   Value: yes|no,  default: yes
-# This option has to be 'yes' to get to a sane state for a firewall
-# restart or stop. Only set to 'no' if there are problems unloading netfilter
-# modules.
-EBTABLES_MODULES_UNLOAD="yes"
-
-# Load firewall rules on system startup.
-#   Value: yes|no,  default: no
-# Restores the ebtables rulesets from the last saved state when the
-# system boots up.
-EBTABLES_LOAD_ON_START="no"
-
-# Save current firewall rules on stop.
-#   Value: yes|no,  default: no
-# Saves all firewall rules if firewall gets stopped
-# (e.g. on system shutdown).
-EBTABLES_SAVE_ON_STOP="no"
-
-# Save current firewall rules on restart.
-#   Value: yes|no,  default: no
-# Saves all firewall rules if firewall gets restarted.
-EBTABLES_SAVE_ON_RESTART="no"
-
-# Save (and restore) rule counters.
-#   Value: yes|no,  default: no
-# Save rule counters when saving a kernel table to a file. If the
-# rule counters were saved, they will be restored when restoring the table.
-EBTABLES_SAVE_COUNTER="no"
-
-# Backup suffix for ruleset save files.
-#   Value: <string>,  default: "~"
-# Keep one backup level of saved rules.
-# Set this variable to the empty string to disable backups.
-EBTABLES_BACKUP_SUFFIX="~"
diff --git a/default/g15daemon b/default/g15daemon

index fce56c663d1f675df03eb38da775df9135c71257..78528e2e9f660a474801e9bdd56a82d867033e70 100644 (file)
--- a/default/g15daemon
+++ b/default/g15daemon
@@ -1,12 +1,6 @@
  # Defaults for g15daemon initscript
  
-# SWITCH_KEY selects  the key used to switch between client screens
-#
-# SWITCH_KEY="MR"   to use the MR key (on top left)
-# SWITCH_KEY="L1    to use the L1 key: the small round key below the LCD
-
-
-SWITCH_KEY="L1"
+# SWITCH_KEY option was removed. Use DAEMON_OPTS="-s" instead.
  
  # Turn on debugging of g15 init.d and udev scripts
  #G15DEBUG="on"
diff --git a/default/im-config b/default/im-config

index 4e7a6b99b41e90cb0de68ab863ab70300ea96a49..522a4abe7579973e90c753da432f7175d3b35bf4 100644 (file)
--- a/default/im-config
+++ b/default/im-config
@@ -4,7 +4,7 @@ OLDIFS="$IFS"
  IFS=':'
  desktop=
  for val in $XDG_CURRENT_DESKTOP; do
-    for d in 'Unity' 'MATE' 'GNOME'; do
+    for d in 'GNOME' 'MATE' 'UKUI' 'Unity'; do
          [ "$d" = "$val" ] && { desktop="$d"; break 2; }
      done
  done
@@ -19,7 +19,7 @@ else
  fi
  
  # Set locale dependent preferred IM over standard auto mode
-if [ "$desktop" != 'GNOME' -a "${XDG_CURRENT_DESKTOP%%:*}" != 'GNOME-Flashback' ]; then
+if [ "$desktop" != 'GNOME' ]; 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/netfilter-persistent b/default/netfilter-persistent

index 7b31799e83c50131d2739dc1180415a45e9160ec..661c678e45dbbcad07b183ee4eee1910c000ebf2 100644 (file)
--- a/default/netfilter-persistent
+++ b/default/netfilter-persistent
@@ -2,3 +2,9 @@
  # Plugins may extend this file or have their own
  
  FLUSH_ON_STOP=0
+
+# Set to yes to skip saving rules/sets when netfilter-persistent is called with
+# the save parameter
+# IPTABLES_SKIP_SAVE=yes
+# IP6TABLES_SKIP_SAVE=yes
+# IPSET_SKIP_SAVE=yes
diff --git a/default/networking b/default/networking

index 469f4cad44aa91184ad98b00973bc50a7e36a8c9..965535925c5d4e24d016a959862683852f205b46 100644 (file)
--- a/default/networking
+++ b/default/networking
@@ -9,3 +9,23 @@
  
  # Set to 'yes' to enable additional verbosity
  #VERBOSE=no
+
+# Method to wait for the network to become online,
+# for services that depend on a working network:
+# - ifup: wait for ifup to have configured an interface.
+# - route: wait for a route to a given address to appear.
+# - ping/ping6: wait for a host to respond to ping packets.
+# - none: don't wait.
+#WAIT_ONLINE_METHOD=ifup
+
+# Which interface to wait for.
+# If none given, wait for all auto interfaces, or if there are none,
+# wait for at least one hotplug interface.
+#WAIT_ONLINE_IFACE=
+
+# Which address to wait for for route, ping and ping6 methods.
+# If none is given for route, it waits for a default gateway.
+#WAIT_ONLINE_ADDRESS=
+
+# Timeout in seconds for waiting for the network to come online.
+#WAIT_ONLINE_TIMEOUT=300
diff --git a/default/rsyslog b/default/rsyslog

deleted file mode 100644 (file)

index 8ec3ea0..0000000
--- a/default/rsyslog
+++ /dev/null
@@ -1,4 +0,0 @@
-# Options for rsyslogd
-# -x disables DNS lookups for remote messages
-# See rsyslogd(8) for more details
-RSYSLOGD_OPTIONS=""
diff --git a/default/speech-dispatcher b/default/speech-dispatcher

deleted file mode 100644 (file)

index 9956b95..0000000
--- a/default/speech-dispatcher
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defaults for the speech-dispatcher initscript, from speech-dispatcher
-
-# Set to yes to start system wide Speech Dispatcher
-RUN=no
diff --git a/default/ufw b/default/ufw

index 83c9ac3e6f1627e3c99e79f4ffb739cee8a9f970..7989f4bbb853385101391fa6dd63f9045c2476ee 100644 (file)
--- a/default/ufw
+++ b/default/ufw
@@ -34,13 +34,14 @@ MANAGE_BUILTINS=no
  # only enable if using iptables backend
  IPT_SYSCTL=/etc/ufw/sysctl.conf
  
-# Extra connection tracking modules to load. Complete list can be found in
-# net/netfilter/Kconfig of your kernel source. Some common modules:
+# Extra connection tracking modules to load. IPT_MODULES should typically be
+# empty for new installations and modules added only as needed. See
+# 'CONNECTION HELPERS' from 'man ufw-framework' for details. Complete list can
+# be found in net/netfilter/Kconfig of your kernel source. Some common modules:
  # nf_conntrack_irc, nf_nat_irc: DCC (Direct Client to Client) support
  # nf_conntrack_netbios_ns: NetBIOS (samba) client support
  # nf_conntrack_pptp, nf_nat_pptp: PPTP over stateful firewall/NAT
  # nf_conntrack_ftp, nf_nat_ftp: active FTP support
  # nf_conntrack_tftp, nf_nat_tftp: TFTP support (server side)
  # nf_conntrack_sane: sane support
-IPT_MODULES="nf_conntrack_ftp nf_nat_ftp nf_conntrack_netbios_ns"
-
+IPT_MODULES=""
diff --git a/dkms/template-dkms-mkdeb/debian/control b/dkms/template-dkms-mkdeb/debian/control

index 1fe029a4014f3c9c194e4ab018cf83bad57c1960..b455166a192d3498f757888b7dd4a3ccccc75f57 100644 (file)
--- a/dkms/template-dkms-mkdeb/debian/control
+++ b/dkms/template-dkms-mkdeb/debian/control
@@ -7,5 +7,6 @@ Standards-Version: 3.8.1
  
  Package: DEBIAN_PACKAGE-dkms
  Architecture: DEBIAN_BUILD_ARCH
+Provides: DEBIAN_PACKAGE-modules (= MODULE_VERSION)
  Depends: dkms (>= 1.95), ${misc:Depends}
  Description: DEBIAN_PACKAGE driver in DKMS format.
diff --git a/dkms/template-dkms-mkdeb/debian/postinst b/dkms/template-dkms-mkdeb/debian/postinst

index c4ad0da4a61f474af3f5bb95729c216cf64467c9..e87022f9af0ed1cfbac9d2a23be00a1cc07fbffd 100755 (executable)
--- a/dkms/template-dkms-mkdeb/debian/postinst
+++ b/dkms/template-dkms-mkdeb/debian/postinst
@@ -10,7 +10,7 @@ NAME=MODULE_NAME
  PACKAGE_NAME=$NAME-dkms
  DEB_NAME=$(echo $PACKAGE_NAME | sed 's,_,-,')
  CVERSION=`dpkg-query -W -f='${Version}' $DEB_NAME | awk -F "-" '{print $1}' | cut -d\: -f2`
-ARCH=`dpkg --print-architecture`
+ARCH=`dpkg-architecture -qDEB_BUILD_GNU_CPU`
  
  dkms_configure () {
         for POSTINST in /usr/lib/dkms/common.postinst "/usr/share/$PACKAGE_NAME/postinst"; do
diff --git a/dput.cf b/dput.cf

index cfb6513454e81b9b596f7fe470e47e34b2e4efe4..e9f320cf1a53b31ef500bd5e72414592b8b06bba 100644 (file)
--- a/dput.cf
+++ b/dput.cf
@@ -25,10 +25,10 @@ login                       = anonymous
  allow_dcut             = 1
  method                 = ftp
  # Please, upload your package to the proper archive
-# http://www.debian.org/doc/manuals/developers-reference/pkgs.html#bug-security-upload
+# https://www.debian.org/doc/manuals/developers-reference/pkgs.html#bug-security-upload
  allowed_distributions  = (?!UNRELEASED|.*-security)
  
-# http://lists.debian.org/debian-project/2009/05/msg00036.html
+# https://lists.debian.org/debian-project/2009/05/msg00036.html
  [ftp-eu]
  fqdn                   = ftp.eu.upload.debian.org
  method                 = ftp
@@ -36,10 +36,10 @@ incoming            = /pub/UploadQueue/
  login                  = anonymous
  allow_dcut             = 1
  # Please, upload your package to the proper archive
-# http://www.debian.org/doc/manuals/developers-reference/pkgs.html#bug-security-upload
+# https://www.debian.org/doc/manuals/developers-reference/pkgs.html#bug-security-upload
  allowed_distributions  = (?!UNRELEASED|.*-security)
  
-# http://lists.debian.org/debian-devel-announce/2008/09/msg00007.html
+# https://lists.debian.org/debian-devel-announce/2008/09/msg00007.html
  [ssh-upload]
  login                  = *
  # login                        = another_username
@@ -48,7 +48,7 @@ method                        = scp
  incoming               = /srv/upload.debian.org/UploadQueue/
  allow_dcut             = 1
  # Please, upload your package to the proper archive
-# http://www.debian.org/doc/manuals/developers-reference/pkgs.html#bug-security-upload
+# https://www.debian.org/doc/manuals/developers-reference/pkgs.html#bug-security-upload
  allowed_distributions  = (?!UNRELEASED|.*-security)
  
  # And if you want to override one of the defaults, add it here.
@@ -91,7 +91,7 @@ login                 = anonymous
  [mentors]
  method                 = ftp
  fqdn                   = mentors.debian.net
-incoming               = .
+incoming               = /pub/UploadQueue
  login                  = anonymous
  
  [local]
diff --git a/emacs/site-start.d/00debian-vars.el b/emacs/site-start.d/00debian-vars.el

deleted file mode 100644 (file)

index a9db99c..0000000
--- a/emacs/site-start.d/00debian-vars.el
+++ /dev/null
@@ -1,57 +0,0 @@
-;; 00debian-vars.el
-;;
-;; Initialize some emacs variables from debian policy files.
-;;
-;; Copyright (C) 1997, Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
-;;
-;; original Author: Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
-;; enhanced and documented by: Mark Eichin <eichin@kitten.gen.ma.us>
-
-;;=============================================================================
-;; Autoloaded section.
-;;=============================================================================
-
-\f
-;;;###
-
-(eval-when-compile
-  ;; Quiet byte compiler
-  (defvar gnus-nntpserver-file))
-
-;;;***
-\f
-
-;;=============================================================================
-;; Configuration section.
-;;=============================================================================
-(defun debian-file->string (name &optional func)
-  "Convert a file into a string"
-  (interactive "fFile name : ")
-  (let ((filename (expand-file-name name)))
-    (if (not (file-readable-p filename))
-        nil
-      (with-temp-buffer
-        ;; Do not run any user `find-file-hooks'
-        (insert-file-contents-literally filename)
-        (if func
-            (funcall func))
-        (buffer-string)))))
-
-(defun debian-clean-mailname ()
-  (while (search-forward "\n" nil t)
-    (replace-match "" nil t)))
-
-;; Particular variables, and their justification:
-;; policy/ch4.html, 4.3 Mail processing on Debian systems, /etc/mailname
-;; policy/ch-binarypkg.html, 3.5 Maintainer scripts, /etc/news/server
-
-(let ((mailname
-       (debian-file->string "/etc/mailname" (function debian-clean-mailname))))
-  (if mailname
-      (setq mail-host-address mailname)))
-
-;; Don't need to check NNTPSERVER for override, gnus does that for us.
-(if (file-readable-p "/etc/news/server")
-    (setq gnus-nntpserver-file "/etc/news/server"))
-
-;;; 00debian-vars.el ends here
diff --git a/emacs/site-start.d/50dictionaries-common.el b/emacs/site-start.d/50dictionaries-common.el

index 924f6053d0a8fb5ee1461a45fec4d413e9ea40a8..0719f652c583fccc4f1578744c323ab1fdc1a991 100644 (file)
--- a/emacs/site-start.d/50dictionaries-common.el
+++ b/emacs/site-start.d/50dictionaries-common.el
@@ -27,7 +27,10 @@
      ;;  a) It exists, that is, package is not removed.
      ;;  b) Not in installations under dpkg control, otherwise we might get some
      ;;     bogus errors on installation because of #132355 and friends.
-    (if (file-exists-p "/usr/share/emacs/site-lisp/dictionaries-common/debian-ispell.el")
+    (if (file-exists-p
+        (concat "/usr/share/"
+                (symbol-name debian-emacs-flavor)
+                "/site-lisp/dictionaries-common/debian-ispell.el"))
         (if (getenv "DPKG_RUNNING_VERSION")
             (message "Info: Skip debian-el loading if run under dpkg control.")
           (let ((coding-system-for-read 'raw-text)) ;; Read these as data streams
diff --git a/emacs/site-start.el b/emacs/site-start.el

deleted file mode 100644 (file)

index 06a95b1..0000000
--- a/emacs/site-start.el
+++ /dev/null
@@ -1,8 +0,0 @@
-;; Emacsen independent startup file.  All of the various installed
-;; flavors of emacs (emacs22, emacs23, xemacs21) will load this file
-;; at startup.  Make sure any code you put here is emacs flavor
-;; independent.
-
-;; Package maintainers: do not have Debian packages edit this file.
-;; See /usr/share/doc/emacsen-common/debian-emacs-policy.gz for the
-;; proper way to handle Emacs package initialization code.
diff --git a/environment.d/90atk-adaptor.conf b/environment.d/90atk-adaptor.conf

new file mode 100644 (file)

index 0000000..67b1a35
--- /dev/null
+++ b/environment.d/90atk-adaptor.conf
@@ -0,0 +1 @@
+GTK_MODULES=${GTK_MODULES:+$GTK_MODULES:}gail:atk-bridge
diff --git a/environment.d/90qt-a11y.conf b/environment.d/90qt-a11y.conf

new file mode 100644 (file)

index 0000000..46a63b2
--- /dev/null
+++ b/environment.d/90qt-a11y.conf
@@ -0,0 +1 @@
+QT_ACCESSIBILITY=1
diff --git a/etckeeper/commit.d/50vcs-commit b/etckeeper/commit.d/50vcs-commit

index 55f0db2440abcd6a7756e0d93d98b71af2324758..bd4b1d4aa1743034b074cc16b70b687667c6c549 100755 (executable)
--- a/etckeeper/commit.d/50vcs-commit
+++ b/etckeeper/commit.d/50vcs-commit
@@ -12,16 +12,15 @@ if [ -n "$1" ]; then
         if [ "x$1" = "x--stdin" ]; then
                 cat > "$logfile"
         else
-               if [ "x$1" = "x-m" ]; then
-                       shift 1
-               fi
-               echo "$1" > "$logfile"
+               sed '1s/^-m \{0,1\}//' >"$logfile" <<-EOF
+                       $*
+               EOF
         fi
  else
         logfile=""
  fi
  
-hostname=`hostname`
+hostname=`hostname 2>/dev/null || cat /etc/hostname`
  hostname="${hostname%%.*}"
  dnsdomainname=`dnsdomainname 2>/dev/null || true`
  if [ -n "$dnsdomainname" ]; then
@@ -41,9 +40,16 @@ else
  fi
  
  if [ "$VCS" = git ] && [ -d .git ]; then
+       # When not su'd to root, still set environment variables, 
+       # since git's own code to determine the author and committer
+       # has several edge cases where it fails and would prevent the
+       # commit.
+       if [ -z "$USER" ]; then
+               USER="$(whoami)"
+       fi
         if [ -n "$USER" ]; then
                 # Use user.name and user.email from the gitconfig belonging
-               # to the user who became root.
+               # to USER.
                 USER_HOME="$(getent passwd "$USER" | cut -d: -f6)"
                 if [ -n "$USER_HOME" ] && [ -e "$USER_HOME/.gitconfig" ]; then
                         if [ -z "$GIT_AUTHOR_NAME" ]; then
diff --git a/etckeeper/commit.d/99push b/etckeeper/commit.d/99push

index b5418f7434d95b9d1b26e8d03a7536a714d10c39..3df1350b93f4a126cf8d2b751115698dc013187d 100755 (executable)
--- a/etckeeper/commit.d/99push
+++ b/etckeeper/commit.d/99push
@@ -2,7 +2,7 @@
  if [ -n "$PUSH_REMOTE" ]; then
         if [ "$VCS" = git ] && [ -d .git ]; then
                 for REMOTE in $PUSH_REMOTE; do
-                       git push "$REMOTE" master || true
+                       git push "$REMOTE" || true
                 done
         elif [ "$VCS" = hg ] && [ -d .hg ]; then
                 for REMOTE in $PUSH_REMOTE; do
diff --git a/etckeeper/etckeeper.conf b/etckeeper/etckeeper.conf

index 0fb660bd98220ce5c881b1057bec0c1573698c9f..f13de1c5fb034ac20679ae3fd95e99799923323b 100644 (file)
--- a/etckeeper/etckeeper.conf
+++ b/etckeeper/etckeeper.conf
@@ -32,11 +32,11 @@ DARCS_COMMIT_OPTIONS="-a"
  #AVOID_COMMIT_BEFORE_INSTALL=1
  
  # The high-level package manager that's being used.
-# (apt, pacman, pacman-g2, yum, dnf, zypper etc)
+# (apt, pacman, pacman-g2, yum, dnf, zypper, apk etc)
  HIGHLEVEL_PACKAGE_MANAGER=apt
  
  # The low-level package manager that's being used.
-# (dpkg, rpm, pacman, pacmatic, pacman-g2, etc)
+# (dpkg, rpm, pacman, pacmatic, pacman-g2, apk etc)
  LOWLEVEL_PACKAGE_MANAGER=dpkg
  
  # To push each commit to a remote, put the name of the remote here.
diff --git a/etckeeper/init.d/40vcs-init b/etckeeper/init.d/40vcs-init

index 3c7a3bb9574a2b6e183b0176acfe4cbdebe48117..27eba4e963ce199cf30e5f688a1f140259e93649 100755 (executable)
--- a/etckeeper/init.d/40vcs-init
+++ b/etckeeper/init.d/40vcs-init
@@ -1,17 +1,18 @@
  #!/bin/sh
  set -e
  
+description="$(hostname 2>/dev/null || cat /etc/hostname) /etc repository"
  if [ "$VCS" = git ] && [ ! -e .git ]; then
         git init
-       echo "$(hostname) /etc repository" > .git/description
+       echo "$description" > .git/description
  elif [ "$VCS" = hg ] && [ ! -e .hg ]; then
         hg init
         echo  "[web]" > .hg/hgrc
-       echo  "description = $(hostname) /etc repository" >> .hg/hgrc
+       echo  "description = $description" >> .hg/hgrc
  elif [ "$VCS" = bzr ] && [ ! -e .bzr ]; then
         bzr init
-       bzr nick "$(hostname) /etc repository"
+       bzr nick "$description"
  elif [ "$VCS" = darcs ] && [ ! -e _darcs ]; then
         darcs initialize
-       echo "$(hostname) /etc repository" > _darcs/prefs/motd
+       echo "$description" > _darcs/prefs/motd
  fi
diff --git a/etckeeper/list-installed.d/50list-installed b/etckeeper/list-installed.d/50list-installed

index 129447f9876385f34bc844fcc1c5ba5acfbd1538..d89b8ceee3c3d8f56ff2ef233c358dbd4574cd52 100755 (executable)
--- a/etckeeper/list-installed.d/50list-installed
+++ b/etckeeper/list-installed.d/50list-installed
@@ -21,5 +21,7 @@ else
                 pacmatic -Q
         elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pkgng ]; then
                 pkg info -E "*"
+       elif [ "$LOWLEVEL_PACKAGE_MANAGER" = apk ]; then
+               apk info -v | sort
         fi
  fi
diff --git a/etckeeper/post-install.d/50vcs-commit b/etckeeper/post-install.d/50vcs-commit

index 53138c82d2c673201a245171d1a2508f832f3c35..bc9cdf052d94198c8b3738d81018fdcae69a17be 100755 (executable)
--- a/etckeeper/post-install.d/50vcs-commit
+++ b/etckeeper/post-install.d/50vcs-commit
@@ -3,8 +3,23 @@ set -e
  
  pl="/var/cache/etckeeper/packagelist"
  
+# Parent process is etckeeper
+# (Only procps ps is currently supported, others will fail,
+# so this may end up empty.)
+ETCKEEPER_PID=$( ps --no-headers -o ppid "${PPID}" 2>/dev/null | sed 's/^ *//' )
+
+# Find the parent of etckeeper and get the command line of the process
+if ! [ -z "${ETCKEEPER_PID}" ]; then
+       ETCKEEPER_PPID=$( ps --no-headers -o ppid "${ETCKEEPER_PID}" | sed 's/^ *//' )
+       ETCKEEPER_PARENT_COMMAND_LINE=$( ps --no-headers -o args "${ETCKEEPER_PPID}" )
+fi
+
  if etckeeper unclean; then
-       message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run"
+       if [ -z "${ETCKEEPER_PARENT_COMMAND_LINE}" ]; then
+               message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run"
+       else
+               message="committing changes in /etc made by \"$ETCKEEPER_PARENT_COMMAND_LINE\""
+       fi
  
         set +e
         if [ -e $pl.pre-install ] && [ "$(cat $pl.fmt 2>/dev/null || true)" = "$(etckeeper list-installed fmt)" ]; then
@@ -24,5 +39,5 @@ if etckeeper unclean; then
                 echo "warning: etckeeper failed to commit changes in /etc using $VCS" >&2
         fi
  fi
-       
+
  rm -f $pl.pre-install $pl.fmt
diff --git a/etckeeper/pre-commit.d/20warn-problem-files b/etckeeper/pre-commit.d/20warn-problem-files

index 4ffbfd187b206b1a58946e726d237b1a3304dfcf..6bd5c2bc4e006d764f44abcb219eda694c8e4090 100755 (executable)
--- a/etckeeper/pre-commit.d/20warn-problem-files
+++ b/etckeeper/pre-commit.d/20warn-problem-files
@@ -2,7 +2,7 @@
  set -e
  
  exclude_internal () {
-       egrep -v '(^|/)(.git|.hg|.bzr|_darcs)/'
+       egrep -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
  }
  
  if [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then
diff --git a/etckeeper/pre-commit.d/30store-metadata b/etckeeper/pre-commit.d/30store-metadata

index 2b77c8eda970c6b702f8426d31d0510505e464f8..ce014d1252c0a88b536b806ba076cd396f152348 100755 (executable)
--- a/etckeeper/pre-commit.d/30store-metadata
+++ b/etckeeper/pre-commit.d/30store-metadata
@@ -1,6 +1,10 @@
  #!/bin/sh
  set -e
  
+# Make sure sort always sorts in same order.
+LANG=C
+export LANG
+
  filter_ignore() {
         case "$VCS" in
                 darcs) ignorefile=.darcsignore ;;
@@ -16,7 +20,11 @@ filter_ignore() {
                                 ;;
                         git)
                                 (git ls-files -oi --exclude-standard; git ls-files -oi --exclude-standard --directory) | sort | uniq > "$listfile" || true
-                               sed 's/^\.\///' | grep -xFvf "$listfile"
+                               if [ -s "$listfile" ]; then
+                                       sed 's/^\.\///' | grep -xFvf "$listfile"
+                               else
+                                       cat -
+                               fi
                                 ;;
                 esac
                 rm -f "$listfile"
@@ -51,6 +59,7 @@ generate_metadata() {
         # Keep the sort order the same at all times.
         LC_COLLATE=C
         export LC_COLLATE
+       unset LC_ALL
  
         if [ "$VCS" = git ] || [ "$VCS" = hg ]; then
                 # These version control systems do not track directories,
@@ -70,45 +79,71 @@ generate_metadata() {
   
         # Store things that don't have the default user or group.
         # Store all file modes, in case the user has an unusual umask.
-       find $NOVCS \( -type f -or -type d \) -print | filter_ignore | sort | perl -ne '
-               BEGIN { $q=chr(39) }
-               sub uidname {
-                       my $want=shift;
-                       if (exists $uidcache{$want}) {
-                               return $uidcache{$want};
-                       }
-                       my $name=scalar getpwuid($want);
-                       return $uidcache{$want}=defined $name ? $name : $want;
-               }
-               sub gidname {
-                       my $want=shift;
-                       if (exists $gidcache{$want}) {
-                               return $gidcache{$want};
-                       }
-                       my $name=scalar getgrgid($want);
-                       return $gidcache{$want}=defined $name ? $name : $want;
-               }
-               chomp;
-               my @stat=stat($_);
-               my $mode = $stat[2];
-               my $uid = $stat[4];
-               my $gid = $stat[5];
-               s/$q/$q"$q"$q/g; # escape single quotes
-               s/^/$q/;
-               s/$/$q/;
-               if ($uid != $>) {
-                       printf "maybe chown $q%s$q %s\n", uidname($uid), $_;
-               }
-               if ($gid != $)) {
-                       printf "maybe chgrp $q%s$q %s\n", gidname($gid), $_;
-               }
-               printf "maybe chmod %04o %s\n", $mode & 07777, $_;
-       '
+       find $NOVCS \( -type f -or -type d \) -print | filter_ignore | sort | maybe_chmod_chown
  
         # We don't handle xattrs.
         # Maybe check for getfattr/setfattr and use them if they're available?
  }
  
+maybe_chmod_chown() {
+       if [ "$(which perl 2>/dev/null)" != "" ]; then
+               perl -ne '
+                       BEGIN { $q=chr(39) }
+                       sub uidname {
+                               my $want=shift;
+                               if (exists $uidcache{$want}) {
+                                       return $uidcache{$want};
+                               }
+                               my $name=scalar getpwuid($want);
+                               return $uidcache{$want}=defined $name ? $name : $want;
+                       }
+                       sub gidname {
+                               my $want=shift;
+                               if (exists $gidcache{$want}) {
+                                       return $gidcache{$want};
+                               }
+                               my $name=scalar getgrgid($want);
+                               return $gidcache{$want}=defined $name ? $name : $want;
+                       }
+                       chomp;
+                       my @stat=stat($_);
+                       my $mode = $stat[2];
+                       my $uid = $stat[4];
+                       my $gid = $stat[5];
+                       s/$q/$q"$q"$q/g; # escape single quotes
+                       s/^/$q/;
+                       s/$/$q/;
+                       if ($uid != $>) {
+                               printf "maybe chown $q%s$q %s\n", uidname($uid), $_;
+                       }
+                       if ($gid != $)) {
+                               printf "maybe chgrp $q%s$q %s\n", gidname($gid), $_;
+                       }
+                       printf "maybe chmod %04o %s\n", $mode & 07777, $_;
+               '
+               return $?
+       else
+               # fallback if perl isn't present
+               euid=$(id -u)
+               egid=$(id -g)
+               q="'"
+               while read x; do
+                       stat=$(stat -c "%f:%u:%g:%a:%U:%G" $x)
+                       IFS=":" read mode uid gid perm uname gname <<EOF
+$stat
+EOF
+                       x=$q$(echo $x | sed "s/$q/$q\"$q\"$q/")$q
+                       if [ $uid -ne $euid ]; then
+                               echo maybe chown "'$uname'" $x
+                       fi
+                       if [ $gid -ne $egid ]; then
+                               echo maybe chgrp "'$gname'" $x
+                       fi
+                       echo maybe chmod 0$perm $x
+               done
+       fi
+}
+
  if [ "$VCS" = git ] || [ "$VCS" = hg ] || [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then
         if [ -f .metadata ]; then
                 # remove obsolete .metadata file
diff --git a/etckeeper/update-ignore.d/01update-ignore b/etckeeper/update-ignore.d/01update-ignore

index 73472878587f2d1df117bad451ca0cc74a4ad37a..8733a85f880d78f21d75fc74ab6cebc0f28e7713 100755 (executable)
--- a/etckeeper/update-ignore.d/01update-ignore
+++ b/etckeeper/update-ignore.d/01update-ignore
@@ -99,6 +99,10 @@ writefile () {
                 ignore "*.pacorig"
                 ignore "*.pacsave"
                 nl
+       elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "apk" ]; then
+               comment "new versions of conffiles, stored by apk"
+               ignore "*.apk-new"
+               nl
         fi
         
         comment "old versions of files"
diff --git a/ethertypes b/ethertypes

index 5e700f663987941a2b89b1caa593cc3e7d1c53f2..caa9f56b1365d4f9c384c48477c516c03976255b 100644 (file)
--- a/ethertypes
+++ b/ethertypes
@@ -1,37 +1,45 @@
-#
  # Ethernet frame types
-#              This file describes some of the various Ethernet
-#              protocol types that are used on Ethernet networks.
  #
-# This list could be found on:
-#         http://www.iana.org/assignments/ethernet-numbers
+# The EtherType is a two-octet field of Ethernet frames used to indicate
+# which protocol is contained in their payload.
+#
+# More entries, mostly historical, can be found on:
+#      https://www.iana.org/assignments/ieee-802-numbers/
+#      http://standards-oui.ieee.org/ethertype/eth.txt
  #
-# <name>    <hexnumber> <alias1>...<alias35> #Comment
+# <name>       <hexnumber> <alias1>...<alias35> # Comment
  #
-IPv4           0800    ip ip4          # Internet IP (IPv4)
+IPv4           0800    ip ip4  # IP (IPv4)
  X25            0805
-ARP            0806    ether-arp       #
-FR_ARP         0808                    # Frame Relay ARP        [RFC1701]
-BPQ            08FF                    # G8BPQ AX.25 Ethernet Packet
-DEC            6000                    # DEC Assigned proto
-DNA_DL         6001                    # DEC DNA Dump/Load
-DNA_RC         6002                    # DEC DNA Remote Console
-DNA_RT         6003                    # DEC DNA Routing
-LAT            6004                    # DEC LAT
-DIAG           6005                    # DEC Diagnostics
-CUST           6006                    # DEC Customer use
-SCA            6007                    # DEC Systems Comms Arch
-TEB            6558                    # Trans Ether Bridging   [RFC1701]
-RAW_FR         6559                    # Raw Frame Relay        [RFC1701]
-AARP           80F3                    # Appletalk AARP
-ATALK          809B                    # Appletalk
-802_1Q         8100    8021q 1q 802.1q dot1q # 802.1Q Virtual LAN tagged frame
-IPX            8137                    # Novell IPX
-NetBEUI                8191                    # NetBEUI
-IPv6           86DD    ip6             # IP version 6
-PPP            880B                    # PPP
-ATMMPOA                884C                    # MultiProtocol over ATM
-PPP_DISC       8863                    # PPPoE discovery messages
-PPP_SES                8864                    # PPPoE session messages
-ATMFATE                8884                    # Frame-based ATM Transport over Ethernet
-LOOP           9000    loopback        # loop proto
+ARP            0806    ether-arp # Address Resolution Protocol
+FR_ARP         0808            # Frame Relay ARP [RFC1701]
+BPQ            08FF            # G8BPQ AX.25 over Ethernet
+TRILL          22F3            # TRILL [RFC6325]
+L2-IS-IS       22F4            # TRILL IS-IS [RFC6325]
+TEB            6558            # Transparent Ethernet Bridging [RFC1701]
+RAW_FR         6559            # Raw Frame Relay [RFC1701]
+RARP           8035            # Reverse ARP [RFC903]
+ATALK          809B            # Appletalk
+AARP           80F3            # Appletalk Address Resolution Protocol
+802_1Q         8100    8021q 1q 802.1q dot1q # VLAN tagged frame [802.1q]
+IPX            8137            # Novell IPX
+NetBEUI                8191            # NetBEUI
+IPv6           86DD    ip6     # IP version 6
+PPP            880B            # Point-to-Point Protocol
+MPLS           8847            # MPLS [RFC5332]
+MPLS_MULTI     8848            # MPLS with upstream-assigned label [RFC5332]
+ATMMPOA                884C            # MultiProtocol over ATM
+PPP_DISC       8863            # PPP over Ethernet discovery stage
+PPP_SES                8864            # PPP over Ethernet session stage
+ATMFATE                8884            # Frame-based ATM Transport over Ethernet
+EAPOL          888E            # EAP over LAN [802.1x]
+S-TAG          88A8            # QinQ Service VLAN tag identifier [802.1q]
+EAP_PREAUTH    88C7            # EAPOL Pre-Authentication [802.11i]
+LLDP           88CC            # Link Layer Discovery Protocol [802.1ab]
+MACSEC         88E5            # Media Access Control Security [802.1ae]
+PBB            88E7    macinmac # Provider Backbone Bridging [802.1ah]
+MVRP           88F5            # Multiple VLAN Registration Protocol [802.1q]
+PTP            88F7            # Precision Time Protocol
+FCOE           8906            # Fibre Channel over Ethernet
+FIP            8914            # FCoE Initialization Protocol
+ROCE           8915            # RDMA over Converged Ethernet
diff --git a/fonts/conf.avail/10-autohint.conf b/fonts/conf.avail/10-autohint.conf

index f9032ba3134c88f95a0a756c0beb0ad461e8baa5..50ec3b44e66e6822ca83367ec60542710901b1c3 100644 (file)
--- a/fonts/conf.avail/10-autohint.conf
+++ b/fonts/conf.avail/10-autohint.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Enable autohinter</description>
  <!--  Use the Autohinter --> 
    <match target="pattern">
      <!--
diff --git a/fonts/conf.avail/10-hinting-full.conf b/fonts/conf.avail/10-hinting-full.conf

index 27d8229195c647c3576383363632cb70cb053808..aff7976613c6dc36f9b8336f6e3251e82d39bada 100644 (file)
--- a/fonts/conf.avail/10-hinting-full.conf
+++ b/fonts/conf.avail/10-hinting-full.conf
@@ -1,6 +1,12 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set hintfull to hintstyle</description>
+
    <match target="pattern">
      <!--
        This configuration is available on the major desktop environments.
diff --git a/fonts/conf.avail/10-hinting-medium.conf b/fonts/conf.avail/10-hinting-medium.conf

index e34ab5b344dc12b7aa5377bc59d6b57af38d6a36..1d49f3a8cf520f90ec03a47eebf33ae479f9706d 100644 (file)
--- a/fonts/conf.avail/10-hinting-medium.conf
+++ b/fonts/conf.avail/10-hinting-medium.conf
@@ -1,6 +1,12 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set hintmedium to hintstyle</description>
+
    <match target="pattern">
      <!--
        This configuration is available on the major desktop environments.
diff --git a/fonts/conf.avail/10-hinting-none.conf b/fonts/conf.avail/10-hinting-none.conf

index 0b3810d948513bb8fd60ffd63f83ed5bdc8e415d..a134ed8dda5f863f0bd1f7ed5bff306558f74fc0 100644 (file)
--- a/fonts/conf.avail/10-hinting-none.conf
+++ b/fonts/conf.avail/10-hinting-none.conf
@@ -1,6 +1,12 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set hintnone to hintstyle</description>
+
    <match target="pattern">
      <!--
        This configuration is available on the major desktop environments.
diff --git a/fonts/conf.avail/10-hinting-slight.conf b/fonts/conf.avail/10-hinting-slight.conf

index c244ac0b0e856999d531ae8c7b014728ffdf77cc..f00bcd39568dbe1e8d00fa6bcaacdbdab55145f6 100644 (file)
--- a/fonts/conf.avail/10-hinting-slight.conf
+++ b/fonts/conf.avail/10-hinting-slight.conf
@@ -1,6 +1,12 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set hintslight to hintstyle</description>
+
    <match target="pattern">
      <!--
        This configuration is available on the major desktop environments.
diff --git a/fonts/conf.avail/10-no-sub-pixel.conf b/fonts/conf.avail/10-no-sub-pixel.conf

index 635847c404490b3b8af6c3717d0bbfaa22c87166..4fd1776df7da3a023668eac2aacd3ee5a153155d 100644 (file)
--- a/fonts/conf.avail/10-no-sub-pixel.conf
+++ b/fonts/conf.avail/10-no-sub-pixel.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Disable sub-pixel rendering</description>
  <!--  Disable sub-pixel rendering --> 
    <match target="pattern">
      <!--
diff --git a/fonts/conf.avail/10-scale-bitmap-fonts.conf b/fonts/conf.avail/10-scale-bitmap-fonts.conf

index b4e9cb4f233c9179a7a6361ddf82c45033aadc6e..ebb6c7b5e72a05a27919957017e452cf4246bb66 100644 (file)
--- a/fonts/conf.avail/10-scale-bitmap-fonts.conf
+++ b/fonts/conf.avail/10-scale-bitmap-fonts.conf
@@ -1,7 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
  
+  <description>Bitmap scaling</description>
  <!--
    If font is bitmap, calculate scale factor.
    Note that color bitmap fonts have scalable=true, while
diff --git a/fonts/conf.avail/10-sub-pixel-bgr.conf b/fonts/conf.avail/10-sub-pixel-bgr.conf

index 1378195dd3d9d9ff1fff53bd355d0070b84066c3..241e589d8730c1d1896622da4d9b20324cf88273 100644 (file)
--- a/fonts/conf.avail/10-sub-pixel-bgr.conf
+++ b/fonts/conf.avail/10-sub-pixel-bgr.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Enable sub-pixel rendering with the BGR stripes layout</description>
  <!--  Enable sub-pixel rendering --> 
    <match target="pattern">
      <!--
diff --git a/fonts/conf.avail/10-sub-pixel-rgb.conf b/fonts/conf.avail/10-sub-pixel-rgb.conf

index 757c3b6a775de75451189aa3695be46ce5be0dda..1cb103db75b7c9c0feec5562bee9ab590498976d 100644 (file)
--- a/fonts/conf.avail/10-sub-pixel-rgb.conf
+++ b/fonts/conf.avail/10-sub-pixel-rgb.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Enable sub-pixel rendering with the RGB stripes layout</description>
  <!--  Enable sub-pixel rendering --> 
    <match target="pattern">
      <!--
diff --git a/fonts/conf.avail/10-sub-pixel-vbgr.conf b/fonts/conf.avail/10-sub-pixel-vbgr.conf

index c807e5c0550603dd36cd1715a3fbca244c457517..1a0690af454ca157a91441214f82f9e31478a81f 100644 (file)
--- a/fonts/conf.avail/10-sub-pixel-vbgr.conf
+++ b/fonts/conf.avail/10-sub-pixel-vbgr.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Enable sub-pixel rendering with the vertical BGR stripes layout</description>
  <!--  Enable sub-pixel rendering --> 
    <match target="pattern">
      <!--
diff --git a/fonts/conf.avail/10-sub-pixel-vrgb.conf b/fonts/conf.avail/10-sub-pixel-vrgb.conf

index b5985e03c32481809d2c11738387184260622221..61bc66325d4dd92f9c6c4debd01f50a72bdfe833 100644 (file)
--- a/fonts/conf.avail/10-sub-pixel-vrgb.conf
+++ b/fonts/conf.avail/10-sub-pixel-vrgb.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Enable sub-pixel rendering with the vertical RGB stripes layout</description>
  <!--  Enable sub-pixel rendering --> 
    <match target="pattern">
      <!--
diff --git a/fonts/conf.avail/10-unhinted.conf b/fonts/conf.avail/10-unhinted.conf

index a25e3b1dc9d8e7481ff056ef8b4ff4bf92f00269..f92df0c67e3fd467c9921f65b753cf2b75103d36 100644 (file)
--- a/fonts/conf.avail/10-unhinted.conf
+++ b/fonts/conf.avail/10-unhinted.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Disable hinting</description>
  <!--  Disable hinting --> 
    <match target="pattern">
      <!--
diff --git a/fonts/conf.avail/11-lcdfilter-default.conf b/fonts/conf.avail/11-lcdfilter-default.conf

index 9d7d11f90ad786877efc7597a0e84d3c8c29630c..929caaa20806d09e86f3741184eafad9d501901c 100644 (file)
--- a/fonts/conf.avail/11-lcdfilter-default.conf
+++ b/fonts/conf.avail/11-lcdfilter-default.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Use lcddefault as default for LCD filter</description>
  <!--  Use lcddefault as default for LCD filter -->
    <match target="pattern">
      <!--
diff --git a/fonts/conf.avail/11-lcdfilter-legacy.conf b/fonts/conf.avail/11-lcdfilter-legacy.conf

index 7e2b25675576925adbc9aab04b53aec4d7a4ed0f..25c363510feb6a96eff06253987291224012fe51 100644 (file)
--- a/fonts/conf.avail/11-lcdfilter-legacy.conf
+++ b/fonts/conf.avail/11-lcdfilter-legacy.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Use lcdlegacy as default for LCD filter</description>
  <!--  Use lcdlegacy as default for LCD filter -->
    <match target="pattern">
      <!--
diff --git a/fonts/conf.avail/11-lcdfilter-light.conf b/fonts/conf.avail/11-lcdfilter-light.conf

index 0dd0a9007a0b6991964ea493109fc261c823a00c..6f1eb3deb7d0e874ad030be8dc05510553317715 100644 (file)
--- a/fonts/conf.avail/11-lcdfilter-light.conf
+++ b/fonts/conf.avail/11-lcdfilter-light.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Use lcdlight as default for LCD filter</description>
  <!--  Use lcdlight as default for LCD filter -->
    <match target="pattern">
      <!--
diff --git a/fonts/conf.avail/20-unhint-small-vera.conf b/fonts/conf.avail/20-unhint-small-vera.conf

index c9505ca8e46893b1cecae8bed449bae8ebe1fd33..7b3d7bdf82bcc768a2bd4f513ed5b8ed3389820e 100644 (file)
--- a/fonts/conf.avail/20-unhint-small-vera.conf
+++ b/fonts/conf.avail/20-unhint-small-vera.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Disable hinting for Bitstream Vera fonts when the size is less than 8ppem</description>
  <!-- 
         The Bitstream Vera fonts have GASP entries suggesting that hinting be
         disabled below 8 ppem, but FreeType ignores those, preferring to use
diff --git a/fonts/conf.avail/25-unhint-nonlatin.conf b/fonts/conf.avail/25-unhint-nonlatin.conf

index 9adffa71a729b5bac53be23c5eb1412c54455538..78cc7a3c78e4b6e6d93533dc3343ddf31faff385 100644 (file)
--- a/fonts/conf.avail/25-unhint-nonlatin.conf
+++ b/fonts/conf.avail/25-unhint-nonlatin.conf
@@ -1,7 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
  
+  <description>Disable hinting for CJK fonts</description>
  <!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. -->
  
         <match target="font">
diff --git a/fonts/conf.avail/30-metric-aliases.conf b/fonts/conf.avail/30-metric-aliases.conf

index c755c5e96ca0dfd7610c4524b4e96201f201bab6..147fde6b1c6ac48eed22a2a8bf47593f8e0a77e9 100644 (file)
--- a/fonts/conf.avail/30-metric-aliases.conf
+++ b/fonts/conf.avail/30-metric-aliases.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set substitutions for similar/metric-compatible families</description>
  
  <!--
  
diff --git a/fonts/conf.avail/40-nonlatin.conf b/fonts/conf.avail/40-nonlatin.conf

index 8e339171bf7bb99aca2b7b22ded200191ad39a28..a70a4ad45951ee81cad9c66455a1f798f3dfc1ae 100644 (file)
--- a/fonts/conf.avail/40-nonlatin.conf
+++ b/fonts/conf.avail/40-nonlatin.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set substitutions for non-Latin fonts</description>
  <!--
    Mark common families with their generics so we'll get
    something reasonable
diff --git a/fonts/conf.avail/45-generic.conf b/fonts/conf.avail/45-generic.conf

index f6076bb3e55c5e05a9952b3b464b99a56a9f53bd..e8d19789c667ccd4183d875d935c8909c3a30be0 100644 (file)
--- a/fonts/conf.avail/45-generic.conf
+++ b/fonts/conf.avail/45-generic.conf
@@ -1,36 +1,44 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set substitutions for emoji/math fonts</description>
+
  <!-- Keep in sync with 60-generic.conf -->
  
  <!-- Emoji -->
  
+       <!-- System emoji -->
         <alias binding="same">
-               <family>Emoji Two</family>
+               <family>Noto Color Emoji</family> <!-- Google -->
                 <default><family>emoji</family></default>
         </alias>
         <alias binding="same">
-               <family>Emoji One</family>
+               <family>Apple Color Emoji</family> <!-- Apple -->
                 <default><family>emoji</family></default>
         </alias>
         <alias binding="same">
-               <family>Noto Color Emoji</family> <!-- Google -->
+               <family>Segoe UI Emoji</family> <!-- Microsoft -->
                 <default><family>emoji</family></default>
         </alias>
         <alias binding="same">
-               <family>Apple Color Emoji</family> <!-- Apple -->
+               <family>Twitter Color Emoji</family> <!-- Twitter -->
                 <default><family>emoji</family></default>
         </alias>
         <alias binding="same">
-               <family>Segoe UI Emoji</family> <!-- Microsoft -->
+               <family>EmojiOne Mozilla</family> <!-- Mozilla -->
                 <default><family>emoji</family></default>
         </alias>
+       <!-- Third-party emoji -->
         <alias binding="same">
-               <family>Twitter Color Emoji</family> <!-- Twitter -->
+               <family>Emoji Two</family>
                 <default><family>emoji</family></default>
         </alias>
         <alias binding="same">
-               <family>EmojiOne Mozilla</family> <!-- Mozilla -->
+               <family>Emoji One</family>
                 <default><family>emoji</family></default>
         </alias>
         <!-- B&W -->
diff --git a/fonts/conf.avail/45-latin.conf b/fonts/conf.avail/45-latin.conf

index c6696f8d6f24213dbeb36d76b36b686cd5d5f32a..a9240b94353cdfe5bc28a8a596488d313dd9542f 100644 (file)
--- a/fonts/conf.avail/45-latin.conf
+++ b/fonts/conf.avail/45-latin.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set substitutions for Latin fonts</description>
  <!--
    Mark common families with their generics so we'll get
    something reasonable
diff --git a/fonts/conf.avail/49-sansserif.conf b/fonts/conf.avail/49-sansserif.conf

index c6209a7d3157390b784b51d0afed0491e2b54289..8b587b00a2a6eeac4783365ad5e7487c69642470 100644 (file)
--- a/fonts/conf.avail/49-sansserif.conf
+++ b/fonts/conf.avail/49-sansserif.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Add sans-serif to the family when no generic name</description>
  <!--
    If the font still has no generic name, add sans-serif
   -->
diff --git a/fonts/conf.avail/50-user.conf b/fonts/conf.avail/50-user.conf

index 07c9182e788c244f561138134948046907f9510b..681ed6da0f50d6e61bc84ae9ef09be559939f4ab 100644 (file)
--- a/fonts/conf.avail/50-user.conf
+++ b/fonts/conf.avail/50-user.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Load per-user customization files</description>
         <!--
             Load per-user customization files where stored on XDG Base Directory
             specification compliant places. it should be usually:
diff --git a/fonts/conf.avail/51-local.conf b/fonts/conf.avail/51-local.conf

index ca9fbe1959241d60ea1ae3c122ce9ab3bffbe54b..885c3576c021447d5fbbe9d0cc3b5e94ebe69cbe 100644 (file)
--- a/fonts/conf.avail/51-local.conf
+++ b/fonts/conf.avail/51-local.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Load local customization file</description>
         <!-- Load local system customization file -->
         <include ignore_missing="yes">local.conf</include>
  </fontconfig>
diff --git a/fonts/conf.avail/53-monospace-lcd-filter.conf b/fonts/conf.avail/53-monospace-lcd-filter.conf

index 92b786bf49e1980c5fb8f26c63582b6ff38ba1ca..ca801956651a6ad9d147d662c590024ee8e2fe92 100644 (file)
--- a/fonts/conf.avail/53-monospace-lcd-filter.conf
+++ b/fonts/conf.avail/53-monospace-lcd-filter.conf
@@ -6,6 +6,20 @@
    <match target="pattern">
      <test name="family">
        <string>DejaVu Sans Mono</string>
+    </test>
+    <test name="pixelsize" compare="less_eq">
+      <double>12.0</double>
+    </test>
+
+    <edit name="lcd_filter" mode="append">
+      <const>lcdlegacy</const>
+    </edit>
+    <edit name="hintstyle" mode="append">
+      <const>hintfull</const>
+    </edit>
+  </match>
+  <match target="pattern">
+    <test name="family">
        <string>Bitstream Vera Sans Mono</string>
      </test>
      <test name="pixelsize" compare="less_eq">
diff --git a/fonts/conf.avail/60-generic.conf b/fonts/conf.avail/60-generic.conf

index 2a2b809db14c5c2b958dc443e280322f3e489bb9..be7b52b3afd3e97e86b040f3463d96fee62d7ddf 100644 (file)
--- a/fonts/conf.avail/60-generic.conf
+++ b/fonts/conf.avail/60-generic.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set preferable fonts for emoji/math fonts</description>
  <!-- Keep in sync with 45-generic.conf -->
  
  <!-- Emoji -->
@@ -29,14 +34,15 @@
         <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 -->
+                       <!-- Third-Party fonts -->
+                       <family>Emoji Two</family>
+                       <family>Emoji One</family>
                         <!-- Non-color -->
                         <family>Noto Emoji</family> <!-- Google -->
                         <family>Android Emoji</family> <!-- Google -->
diff --git a/fonts/conf.avail/60-latin.conf b/fonts/conf.avail/60-latin.conf

index 7ea29abaf649b23ad19afdf6548209433769e881..5c081e429c0c48bc38deaae120179464ca44b6f4 100644 (file)
--- a/fonts/conf.avail/60-latin.conf
+++ b/fonts/conf.avail/60-latin.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set preferable fonts for Latin</description>
         <alias>
                 <family>serif</family>
                 <prefer>
diff --git a/fonts/conf.avail/64-language-selector-prefer.conf b/fonts/conf.avail/64-language-selector-prefer.conf

index 8cf9d25ce29ca85aa318f69a1e04799296f58f45..0cffddb7abd6ca3e5c79beb06c8afebc8cd452e2 100644 (file)
--- a/fonts/conf.avail/64-language-selector-prefer.conf
+++ b/fonts/conf.avail/64-language-selector-prefer.conf
@@ -9,6 +9,7 @@
                         <family>Noto Sans CJK SC</family>
                         <family>Noto Sans CJK TC</family>
                         <family>Noto Sans CJK HK</family>
+                       <family>Lohit Devanagari</family>
                 </prefer>
         </alias>
         <alias>
@@ -18,6 +19,7 @@
                         <family>Noto Serif CJK KR</family>
                         <family>Noto Serif CJK SC</family>
                         <family>Noto Serif CJK TC</family>
+                       <family>Lohit Devanagari</family>
                 </prefer>
         </alias>
         <alias>
diff --git a/fonts/conf.avail/65-fonts-persian.conf b/fonts/conf.avail/65-fonts-persian.conf

index ea00661208a1831aae067603879543b1f55dc1cb..5591486ee44eff50d53f777898c9857a1e978439 100644 (file)
--- a/fonts/conf.avail/65-fonts-persian.conf
+++ b/fonts/conf.avail/65-fonts-persian.conf
@@ -31,6 +31,10 @@
      2008       Behdad Esfahbod:  Cleanup.  Add fantasy and cursive.
    -->
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
  
  
  <!-- Deprecated fonts are discouraged -->
diff --git a/fonts/conf.avail/65-khmer.conf b/fonts/conf.avail/65-khmer.conf

index f9d06f2a97ade12a7dfac4be6c91b4746e0c2041..8985c0debe5d789e5c0572eab8003120fff427f6 100644 (file)
--- a/fonts/conf.avail/65-khmer.conf
+++ b/fonts/conf.avail/65-khmer.conf
@@ -1,6 +1,10 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
         <alias>
                 <family>serif</family>
                 <prefer>
diff --git a/fonts/conf.avail/65-nonlatin.conf b/fonts/conf.avail/65-nonlatin.conf

index 90b5347d36dcba3bd14f38e418065b5c32ceb9b4..532218ce88e7511a6e7b11f9fb4b548b1a7d6269 100644 (file)
--- a/fonts/conf.avail/65-nonlatin.conf
+++ b/fonts/conf.avail/65-nonlatin.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set preferable fonts for non-Latin</description>
         <alias>
                 <family>serif</family>
                 <prefer>
diff --git a/fonts/conf.avail/69-unifont.conf b/fonts/conf.avail/69-unifont.conf

index 177dec5d4ed0d0990566c5a97edab630bbaffa35..a3586f295361f0d34dc57feae37edba28d281027 100644 (file)
--- a/fonts/conf.avail/69-unifont.conf
+++ b/fonts/conf.avail/69-unifont.conf
@@ -1,6 +1,10 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
         <alias>
                 <family>serif</family>
                 <prefer>
diff --git a/fonts/conf.avail/70-force-bitmaps.conf b/fonts/conf.avail/70-force-bitmaps.conf

index c153aebdca9279c0ed870c77bc3cf07b047f27b6..0c70a5343327a0c5e572399dfa3ff019b7817cba 100644 (file)
--- a/fonts/conf.avail/70-force-bitmaps.conf
+++ b/fonts/conf.avail/70-force-bitmaps.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Accept bitmap fonts</description>
  <!-- Accept bitmap fonts -->
   <selectfont>
    <acceptfont>
diff --git a/fonts/conf.avail/70-no-bitmaps.conf b/fonts/conf.avail/70-no-bitmaps.conf

index 6b506e82a0ad713bad18e422682e72f9c9355960..efb1bc00aaa72c8e86acf8e5ee9b5e56a1ed0cd3 100644 (file)
--- a/fonts/conf.avail/70-no-bitmaps.conf
+++ b/fonts/conf.avail/70-no-bitmaps.conf
@@ -1,6 +1,11 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Reject bitmap fonts</description>
  <!-- Reject bitmap fonts -->
   <selectfont>
    <rejectfont>
diff --git a/fonts/conf.avail/80-delicious.conf b/fonts/conf.avail/80-delicious.conf

index 845647bed44a105c4fc79455c1fbc1ec4bca667a..8cd01f98927552298909faa0d9221d47d7b9a11e 100644 (file)
--- a/fonts/conf.avail/80-delicious.conf
+++ b/fonts/conf.avail/80-delicious.conf
@@ -1,6 +1,10 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
  <!-- Fix-ups for Delicious family -->
  
  <!-- Delicious 'heavy' variant says its Medium weight -->
diff --git a/fonts/conf.avail/90-synthetic.conf b/fonts/conf.avail/90-synthetic.conf

index b8d1e85e1fb4526e1fd0111e5ec104c20db067c6..6b929dd540351e40e3e5d24292a99aacff3403bc 100644 (file)
--- a/fonts/conf.avail/90-synthetic.conf
+++ b/fonts/conf.avail/90-synthetic.conf
@@ -1,6 +1,10 @@
  <?xml version="1.0"?>
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
  <!-- 
   Artificial oblique for fonts without an italic or oblique version
   -->
@@ -38,13 +42,13 @@
   -->
  
         <match target="font">
-               <!-- check to see if the font is just regular -->
+               <!-- check to see if the weight in the font is less than medium which possibly need emboldening -->
                 <test name="weight" compare="less_eq">
                         <const>medium</const>
                 </test>
                 <!-- check to see if the pattern requests bold -->
-               <test target="pattern" name="weight" compare="more">
-                       <const>medium</const>
+               <test target="pattern" name="weight" compare="more_eq">
+                       <const>bold</const>
                 </test>
                 <!--
                   set the embolden flag
diff --git a/fonts/conf.d/31-cantarell.conf b/fonts/conf.d/31-cantarell.conf

deleted file mode 120000 (symlink)

index 96fab3c..0000000
--- a/fonts/conf.d/31-cantarell.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/fontconfig/conf.avail/31-cantarell.conf
-\ No newline at end of file
diff --git a/fonts/fonts.conf b/fonts/fonts.conf

index 79b86b72142b4dec153182354a0a1f545da583f4..f0f908e0efdb8fb85fde80d297be2ac8803a4904 100644 (file)
--- a/fonts/fonts.conf
+++ b/fonts/fonts.conf
@@ -2,6 +2,11 @@
  <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
  <!-- /etc/fonts/fonts.conf file to configure system font access -->
  <fontconfig>
+       <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+               <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+       </its:rules>
+
+       <description>Default configuration file</description>
  
  <!--
         DO NOT EDIT THIS FILE.
diff --git a/gdm3/custom.conf b/gdm3/custom.conf

index 92eeb5e76539ef30779928006de7257b415ee414..b6ba63c417e1f14557bbaef7426a4796023a66cb 100644 (file)
--- a/gdm3/custom.conf
+++ b/gdm3/custom.conf
@@ -3,7 +3,7 @@
  # See /usr/share/gdm/gdm.schemas for a list of available options.
  
  [daemon]
-# Uncoment the line below to force the login screen to use Xorg
+# Uncomment the line below to force the login screen to use Xorg
  #WaylandEnable=false
  
  # Enabling automatic login
diff --git a/gdm3/greeter.dconf-defaults b/gdm3/greeter.dconf-defaults

index 62fa3b0a96d3237c3cc0a37610c2d392431a0ecf..d9c264ed9ec25e7782ed620484c2468bcad5428d 100644 (file)
--- a/gdm3/greeter.dconf-defaults
+++ b/gdm3/greeter.dconf-defaults
@@ -9,22 +9,21 @@
  # Theming options
  # ===============
  #  - Change the GTK+ theme
-# [org/gnome/desktop/interface]
+[org/gnome/desktop/interface]
  # gtk-theme='Adwaita'
  #  - Use another background
-# [org/gnome/desktop/background]
+[org/gnome/desktop/background]
  # picture-uri='file:///usr/share/themes/Adwaita/backgrounds/stripes.jpg'
  # picture-options='zoom'
  #  - Or no background at all
-# [org/gnome/desktop/background]
+[org/gnome/desktop/background]
  # picture-options='none'
  # primary-color='#000000'
  
  # Login manager options
  # =====================
-#[org/gnome/login-screen]
-#logo='/usr/share/icons/hicolor/48x48/emblems/emblem-debian-white.png'
-#fallback-logo='/usr/share/icons/hicolor/48x48/emblems/emblem-debian-white.png'
+[org/gnome/login-screen]
+#logo='/usr/share/images/vendor-logos/logo-text-version-128.png'
  
  # - Disable user list
  # disable-user-list=true
@@ -33,3 +32,16 @@
  # - Show a login welcome message
  # banner-message-enable=true
  # banner-message-text='Welcome'
+
+# Automatic suspend
+# =================
+[org/gnome/settings-daemon/plugins/power]
+# - Time inactive in seconds before suspending with AC power
+#   1200=20 minutes, 0=never
+# sleep-inactive-ac-timeout=1200
+# - What to do after sleep-inactive-ac-timeout
+#   'blank', 'suspend', 'shutdown', 'hibernate', 'interactive' or 'nothing'
+# sleep-inactive-ac-type='suspend'
+# - As above but when on battery
+# sleep-inactive-battery-timeout=1200
+# sleep-inactive-battery-type='suspend'
diff --git a/geoclue/geoclue.conf b/geoclue/geoclue.conf

index 61b649674d063f27eb34cc5cf95c20fef485147b..1f09cae107ad76e589e4afc08a392dec91da466b 100644 (file)
--- a/geoclue/geoclue.conf
+++ b/geoclue/geoclue.conf
@@ -1,11 +1,16 @@
  # Configuration file for Geoclue
+#
+# NOTE: All configurations settings below are mandatory and the defaults are
+#       what you see before you edit them. If you want to keep the default
+#       values around, copy and comment out the appropriate line(s) before
+#       changing them.
  
  # Agent configuration options
  [agent]
  
  # Whitelist of desktop IDs (without .desktop part) of all agents we recognise,
  # separated by a ';'.
-whitelist=gnome-shell
+whitelist=geoclue-demo-agent;gnome-shell;io.elementary.desktop.agent-geoclue2
  
  # Network NMEA source configuration options
  [network-nmea]
@@ -13,9 +18,30 @@ whitelist=gnome-shell
  # Fetch location from NMEA sources on local network?
  enable=true
  
+# 3G source configuration options
+[3g]
+
+# Enable 3G source
+enable=true
+
+# CDMA source configuration options
+[cdma]
+
+# Enable CDMA source
+enable=true
+
+# Modem GPS source configuration options
+[modem-gps]
+
+# Enable Modem-GPS source
+enable=true
+
  # WiFi source configuration options
  [wifi]
  
+# Enable WiFi source
+enable=true
+
  # URL to the wifi geolocation service. The key can currenty be anything, just
  # needs to be present but that is likely going to change in future.
  url=https://location.services.mozilla.com/v1/geolocate?key=geoclue
@@ -24,6 +50,11 @@ url=https://location.services.mozilla.com/v1/geolocate?key=geoclue
  # this url while changing API_KEY to your Google API key and comment out or
  # remove the url above.
  #
+# WARNING: Please make sure that you are complying with the Google's ToS and
+#          policies if you uncomment this:
+#
+# https://developers.google.com/maps/documentation/geolocation/policies
+#
  #url=https://www.googleapis.com/geolocation/v1/geolocate?key=YOUR_KEY
  
  # Submit data to Mozilla Location Service
@@ -35,18 +66,21 @@ submit-data=false
  # URL to submission API of Mozilla Location Service
  submission-url=https://location.services.mozilla.com/v1/submit?key=geoclue
  
-# A nickname to submit network data with. This is currently used for leaderboard:
-# https://location.services.mozilla.com/leaders
-# A nickname must be 2-32 characters long.
+# A nickname to submit network data with. A nickname must be 2-32 characters long.
  submission-nick=geoclue
  
  # Application configuration options
  #
  # NOTE: Having an entry here for an application with allowed=true means that
  #       geoclue will not ask agent to authorize the application. This is to
-#       ensure that system components and applications with built-in
-#       authorization mechanism (e.g web browsers) do not have to be bound to
-#       agents.
+#       ensure that applications with built-in authorization mechanism (e.g web
+#       browsers) do not have to be bound to agents.
+#
+#       If your application is denied access to location information and your
+#       operating system doesn't provide any mechanism to change that, it is
+#       likely a bug in your operation system (or geoclue). The solution is to
+#       report the issue with all details, rather than adding your application
+#       to this list.
  #
  # Format:
  #
@@ -78,6 +112,11 @@ allowed=true
  system=true
  users=
  
+[io.elementary.desktop.agent-geoclue2]
+allowed=true
+system=true
+users=
+
  [epiphany]
  allowed=true
  system=false
diff --git a/git-buildpackage/gbp.conf b/git-buildpackage/gbp.conf

index d104a50def75f3c57fa6f4719a6157c9a576db52..877db84caf2c964d8cb7a171added2f8e0b4d51b 100644 (file)
--- a/git-buildpackage/gbp.conf
+++ b/git-buildpackage/gbp.conf
@@ -39,8 +39,8 @@
  #tarball-dir = ../tarballs/
  #ignore-new = True
  #export = HEAD
-# compress with bzip2
-#compression = bzip2
+# compress with xz
+#compression = xz
  # use best compression
  #compression-level = best
  # Don't send notifications, alternatives: on/true, off/false or auto
diff --git a/gnome/defaults.list b/gnome/defaults.list

index 267f7ae5587018c1c09105c4fc4e9d1349c0ac2d..004fc923861be0d8c6b05599d7fbd313203d91db 100644 (file)
--- a/gnome/defaults.list
+++ b/gnome/defaults.list
@@ -5,15 +5,15 @@ application/excel=libreoffice-calc.desktop
  application/msexcel=libreoffice-calc.desktop
  application/msword=libreoffice-writer.desktop
  application/ogg=io.github.celluloid_player.Celluloid.desktop;rhythmbox.desktop
-application/oxps=xreader.desktop;evince.desktop;atril.desktop
-application/pdf=xreader.desktop;evince.desktop;atril.desktop
-application/postscript=xreader.desktop;evince.desktop;atril.desktop
+application/oxps=xreader.desktop;org.gnome.Evince.desktop
+application/pdf=xreader.desktop;org.gnome.Evince.desktop
+application/postscript=xreader.desktop;org.gnome.Evince.desktop
  application/rtf=libreoffice-writer.desktop
  application/tab-separated-values=libreoffice-calc.desktop
  application/vnd.lotus-1-2-3=libreoffice-calc.desktop
  application/vnd.ms-excel=libreoffice-calc.desktop
  application/vnd.ms-word=libreoffice-writer.desktop
-application/vnd.ms-xpsdocument=xreader.desktop;evince.desktop;atril.desktop
+application/vnd.ms-xpsdocument=xreader.desktop;org.gnome.Evince.desktop
  application/vnd.rn-realmedia=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnome.Totem.desktop
  application/vnd.sun.xml.base=libreoffice-base.desktop
  application/vnd.sun.xml.calc=libreoffice-calc.desktop
@@ -61,18 +61,18 @@ application/x-applix-spreadsheet=libreoffice-calc.desktop
  application/x-ar=org.gnome.FileRoller.desktop;engrampa.desktop
  application/x-arj=org.gnome.FileRoller.desktop;engrampa.desktop
  application/x-audacity-project=audacity.desktop
-application/x-bzdvi=xreader.desktop;evince.desktop;atril.desktop
+application/x-bzdvi=xreader.desktop;org.gnome.Evince.desktop
  application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;engrampa.desktop
  application/x-bzip=org.gnome.FileRoller.desktop;engrampa.desktop
-application/x-bzpdf=xreader.desktop;evince.desktop;atril.desktop
-application/x-bzpostscript=xreader.desktop;evince.desktop;atril.desktop
-application/x-cbr=xreader.desktop;evince.desktop;atril.desktop
-application/x-cbt=xreader.desktop;evince.desktop;atril.desktop
-application/x-cbz=xreader.desktop;evince.desktop;atril.desktop
+application/x-bzpdf=xreader.desktop;org.gnome.Evince.desktop
+application/x-bzpostscript=xreader.desktop;org.gnome.Evince.desktop
+application/x-cbr=xreader.desktop;org.gnome.Evince.desktop
+application/x-cbt=xreader.desktop;org.gnome.Evince.desktop
+application/x-cbz=xreader.desktop;org.gnome.Evince.desktop
  application/x-compressed-tar=org.gnome.FileRoller.desktop;engrampa.desktop
  application/x-compress=org.gnome.FileRoller.desktop;engrampa.desktop
  application/x-dos_ms_excel=libreoffice-calc.desktop
-application/x-dvi=xreader.desktop;evince.desktop;atril.desktop
+application/x-dvi=xreader.desktop;org.gnome.Evince.desktop
  application/x-ear=org.gnome.FileRoller.desktop;engrampa.desktop
  application/x-excel=libreoffice-calc.desktop
  application/x-extension-m4a=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnome.Totem.desktop
@@ -81,10 +81,10 @@ application/x-flac=rhythmbox.desktop
  application/x-glade=glade.desktop
  application/x-gnumeric=gnumeric.desktop
  application/x-gtar=org.gnome.FileRoller.desktop;engrampa.desktop
-application/x-gzdvi=xreader.desktop;evince.desktop;atril.desktop
+application/x-gzdvi=xreader.desktop;org.gnome.Evince.desktop
  application/x-gzip=org.gnome.FileRoller.desktop;engrampa.desktop
-application/x-gzpdf=xreader.desktop;evince.desktop;atril.desktop
-application/x-gzpostscript=xreader.desktop;evince.desktop;atril.desktop
+application/x-gzpdf=xreader.desktop;org.gnome.Evince.desktop
+application/x-gzpostscript=xreader.desktop;org.gnome.Evince.desktop
  application/xhtml+xml=firefox.desktop
  application/x-jar=openjdk-7-java.desktop
  application/x-java-archive=openjdk-7-java.desktop
@@ -102,7 +102,7 @@ application/x-ms-excel=libreoffice-calc.desktop
  application/x-msexcel=libreoffice-calc.desktop
  application/x-ogg=io.github.celluloid_player.Celluloid.desktop;rhythmbox.desktop
  application/x-oleo=libreoffice-calc.desktop
-application/x-perl=xed.desktop;gedit.desktop;pluma.desktop
+application/x-perl=xed.desktop;org.gnome.gedit.desktop
  application/x-planperfect=libreoffice-calc.desktop
  application/x-quattropro=libreoffice-calc.desktop
  application/x-rar-compressed=org.gnome.FileRoller.desktop;engrampa.desktop
@@ -115,7 +115,7 @@ application/x-tar=org.gnome.FileRoller.desktop;engrampa.desktop
  application/x-war=org.gnome.FileRoller.desktop;engrampa.desktop
  application/x-xbase=libreoffice-calc.desktop
  application/x-xls=libreoffice-calc.desktop
-application/x-xzpdf=xreader.desktop;evince.desktop;atril.desktop
+application/x-xzpdf=xreader.desktop;org.gnome.Evince.desktop
  application/x-zip-compressed=org.gnome.FileRoller.desktop;engrampa.desktop
  application/x-zip=org.gnome.FileRoller.desktop;engrampa.desktop
  application/x-zoo=org.gnome.FileRoller.desktop;engrampa.desktop
@@ -140,7 +140,7 @@ audio/x-it=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnom
  audio/x-m4a=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnome.Totem.desktop
  audio/x-matroska=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnome.Totem.desktop
  audio/x-mod=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnome.Totem.desktop
-audio/x-mp3=rhythmbox.desktop
+audio/x-mp3=io.github.celluloid_player.Celluloid.desktop;rhythmbox.desktop
  audio/x-mpeg=rhythmbox.desktop
  audio/x-mpegurl=rhythmbox.desktop
  audio/x-ms-asf=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnome.Totem.desktop
@@ -165,53 +165,53 @@ audio/x-wavpack=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org
  audio/x-vorbis=io.github.celluloid_player.Celluloid.desktop;rhythmbox.desktop
  audio/x-vorbis+ogg=io.github.celluloid_player.Celluloid.desktop;rhythmbox.desktop
  audio/x-xm=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnome.Totem.desktop
-image/bmp=xviewer.desktop;eog.desktop;eom.desktop
-image/gif=xviewer.desktop;eog.desktop;eom.desktop
-image/jpeg=xviewer.desktop;eog.desktop;eom.desktop
-image/jpg=xviewer.desktop;eog.desktop;eom.desktop
-image/pjpeg=xviewer.desktop;eog.desktop;eom.desktop
-image/png=xviewer.desktop;eog.desktop;eom.desktop
-image/svg+xml=xviewer.desktop;eog.desktop;eom.desktop
-image/tiff=xviewer.desktop;eog.desktop;eom.desktop
-image/vnd.djvu=xreader.desktop;evince.desktop;atril.desktop
+image/bmp=xviewer.desktop;org.gnome.eog.desktop
+image/gif=xviewer.desktop;org.gnome.eog.desktop
+image/jpeg=xviewer.desktop;org.gnome.eog.desktop
+image/jpg=xviewer.desktop;org.gnome.eog.desktop
+image/pjpeg=xviewer.desktop;org.gnome.eog.desktop
+image/png=xviewer.desktop;org.gnome.eog.desktop
+image/svg+xml=xviewer.desktop;org.gnome.eog.desktop
+image/tiff=xviewer.desktop;org.gnome.eog.desktop
+image/vnd.djvu=xreader.desktop;org.gnome.Evince.desktop
  image/vnd.rn-realpix=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnome.Totem.desktop
-image/x-bmp=xviewer.desktop;eog.desktop;eom.desktop
-image/x-bzeps=xreader.desktop;evince.desktop;atril.desktop
-image/x-eps=xreader.desktop;evince.desktop;atril.desktop
-image/x-gray=xviewer.desktop;eog.desktop;eom.desktop
-image/x-gzeps=xreader.desktop;evince.desktop;atril.desktop
-image/x-icb=xviewer.desktop;eog.desktop;eom.desktop
-image/x-ico=xviewer.desktop;eog.desktop;eom.desktop
-image/x-png=xviewer.desktop;eog.desktop;eom.desktop
-image/x-portable-anymap=xviewer.desktop;eog.desktop;eom.desktop
-image/x-portable-bitmap=xviewer.desktop;eog.desktop;eom.desktop
-image/x-portable-graymap=xviewer.desktop;eog.desktop;eom.desktop
-image/x-portable-pixmap=xviewer.desktop;eog.desktop;eom.desktop
+image/x-bmp=xviewer.desktop;org.gnome.eog.desktop
+image/x-bzeps=xreader.desktop;org.gnome.Evince.desktop
+image/x-eps=xreader.desktop;org.gnome.Evince.desktop
+image/x-gray=xviewer.desktop;org.gnome.eog.desktop
+image/x-gzeps=xreader.desktop;org.gnome.Evince.desktop
+image/x-icb=xviewer.desktop;org.gnome.eog.desktop
+image/x-ico=xviewer.desktop;org.gnome.eog.desktop
+image/x-png=xviewer.desktop;org.gnome.eog.desktop
+image/x-portable-anymap=xviewer.desktop;org.gnome.eog.desktop
+image/x-portable-bitmap=xviewer.desktop;org.gnome.eog.desktop
+image/x-portable-graymap=xviewer.desktop;org.gnome.eog.desktop
+image/x-portable-pixmap=xviewer.desktop;org.gnome.eog.desktop
  image/x-psd=gimp.desktop
-image/x-xbitmap=xviewer.desktop;eog.desktop;eom.desktop
-image/x-xpixmap=xviewer.desktop;eog.desktop;eom.desktop
-inode/directory=nemo.desktop;caja-folder-handler.desktop;nautilus-folder-handler.desktop;Thunar.desktop;kde4-dolphin.desktop
+image/x-xbitmap=xviewer.desktop;org.gnome.eog.desktop
+image/x-xpixmap=xviewer.desktop;org.gnome.eog.desktop
+inode/directory=nemo.desktop;caja-folder-handler.desktop;org.gnome.Nautilus.desktop;Thunar.desktop
  misc/ultravox=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnome.Totem.desktop
  multipart/x-zip=org.gnome.FileRoller.desktop;engrampa.desktop
  text/abiword=abiword.desktop
-text/calendar=evolution.desktop
+text/calendar=org.gnome.Evolution.desktop
  text/comma-separated-values=libreoffice-calc.desktop
  text/csv=libreoffice-calc.desktop
  text/html=firefox.desktop
-text/plain=xed.desktop;gedit.desktop;pluma.desktop
+text/plain=xed.desktop;org.gnome.gedit.desktop
  text/richtext=abiword.desktop
  text/rtf=libreoffice-writer.desktop
  text/spreadsheet=libreoffice-calc.desktop
  text/tab-separated-values=libreoffice-calc.desktop
  text/x-comma-separated-values=libreoffice-calc.desktop
-text/x-chdr=xed.desktop;gedit.desktop;pluma.desktop
-text/x-csrc=xed.desktop;gedit.desktop;pluma.desktop
-text/x-dtd=xed.desktop;gedit.desktop;pluma.desktop
-text/x-java=xed.desktop;gedit.desktop;pluma.desktop
-text/mathml=xed.desktop;gedit.desktop;pluma.desktop
-text/x-python=xed.desktop;gedit.desktop;pluma.desktop
-text/x-sql=xed.desktop;gedit.desktop;pluma.desktop
-text/xml=xed.desktop;gedit.desktop;pluma.desktop
+text/x-chdr=xed.desktop;org.gnome.gedit.desktop
+text/x-csrc=xed.desktop;org.gnome.gedit.desktop
+text/x-dtd=xed.desktop;org.gnome.gedit.desktop
+text/x-java=xed.desktop;org.gnome.gedit.desktop
+text/mathml=xed.desktop;org.gnome.gedit.desktop
+text/x-python=xed.desktop;org.gnome.gedit.desktop
+text/x-sql=xed.desktop;org.gnome.gedit.desktop
+text/xml=xed.desktop;org.gnome.gedit.desktop
  video/3gpp=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnome.Totem.desktop
  video/dv=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnome.Totem.desktop
  video/fli=io.github.celluloid_player.Celluloid.desktop;xplayer.desktop;org.gnome.Totem.desktop
@@ -261,4 +261,4 @@ x-scheme-handler/apt=apturl.desktop
  x-scheme-handler/http=firefox.desktop
  x-scheme-handler/https=firefox.desktop
  x-scheme-handler/mailto=thunderbird.desktop
-x-scheme-handler/spotify=spotify.desktop
-\ No newline at end of file
+x-scheme-handler/spotify=spotify.desktop
diff --git a/group b/group

index 948cb10f00a8196ab6bc7415735506351a7cef7e..fc8002b1b2be32e97a5191ddbb6b28587ac156dd 100644 (file)
--- a/group
+++ b/group
@@ -87,3 +87,4 @@ vde2-net:x:145:
  nobody:x:1000:
  gast:x:1126:
  docker:x:146:frank
+tcpdump:x:147:
diff --git a/group- b/group-

index f417607b1e7e493696bb1f0652c56ada5a11c2d1..948cb10f00a8196ab6bc7415735506351a7cef7e 100644 (file)
--- a/group-
+++ b/group-
@@ -86,3 +86,4 @@ ulog:x:144:
  vde2-net:x:145:
  nobody:x:1000:
  gast:x:1126:
+docker:x:146:frank
diff --git a/gshadow b/gshadow

index a322f269340f4d96968d37f019bb49ecd408c5da..436b4a23515f15ff5653bd4dde3c17feb4ef9909 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -87,3 +87,4 @@ vde2-net:!::
  nobody:!::
  gast:!::
  docker:!::
+tcpdump:!::
diff --git a/gshadow- b/gshadow-

index f32e9b2c68ffc8e89abda3145cbf81e6f494b6ff..a322f269340f4d96968d37f019bb49ecd408c5da 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -86,3 +86,4 @@ ulog:!::
  vde2-net:!::
  nobody:!::
  gast:!::
+docker:!::
diff --git a/gufw/app_profiles/chromecast.gufw b/gufw/app_profiles/chromecast.gufw

new file mode 100644 (file)

index 0000000..8c3816b
--- /dev/null
+++ b/gufw/app_profiles/chromecast.gufw
@@ -0,0 +1,6 @@
+[chromecast]
+title=ChromeCast
+description=Google Stream device
+ports=32768-61000/udp|8008-8009/tcp|1900/udp
+categories=Audio Video;TV;
+reference=[https://gist.github.com/muff1nman/16a8cd8a46c191f305afdf2b97cc2adf]
diff --git a/gufw/app_profiles/kodi_remote.gufw b/gufw/app_profiles/kodi_remote.gufw

new file mode 100644 (file)

index 0000000..ffb7bb3
--- /dev/null
+++ b/gufw/app_profiles/kodi_remote.gufw
@@ -0,0 +1,5 @@
+[KODI_Remote]
+title=KODI Remote
+description=Remote control for KODI
+ports=8080|9777/udp
+categories=Audio Video;TV;
diff --git a/gufw/app_profiles/qbittorrent.gufw_app b/gufw/app_profiles/qbittorrent.gufw_app

new file mode 100644 (file)

index 0000000..3fe5280
--- /dev/null
+++ b/gufw/app_profiles/qbittorrent.gufw_app
@@ -0,0 +1,6 @@
+[qbittorrent]
+title=qBittorrent
+description=Cross-platform BitTorrent client GUI written with Qt4
+ports=6881/tcp|6881/udp
+warning=Remember to open the ports on the router
+categories=Network;P2P;
diff --git a/hdparm.conf b/hdparm.conf

index fbfe81666ce96ae908b29ffc0d49f2e33a7a8b32..b4bce9215d0f6223afbce15cb1d3108815a74f8c 100644 (file)
--- a/hdparm.conf
+++ b/hdparm.conf
@@ -65,6 +65,10 @@ quiet
  # poweron_standby = off
  # -S standby (spindown) timeout for the drive
  #spindown_time = 24
+# "force_spindown_time" - the same as "-S", but will be applied even if disk
+# doesn't support APM. Use on your own risk. This is debian specific option.
+# See also #758988
+#force_spindown_time = 24
  # -u interrupt-unmask flag for the drive
  #interrupt_unmask = on
  # -W Disable/enable the IDE drive's write-caching feature
diff --git a/init.d/anacron b/init.d/anacron

index 1bc0db7ac164a0b80d570ca1a68f768d249bddb7..c4bd67a731aaa60d9c9a43da338bbe5023999328 100755 (executable)
--- a/init.d/anacron
+++ b/init.d/anacron
@@ -41,7 +41,7 @@ case "$1" in
  
      # on_ac_power doesn't exist, on_ac_power returns 0 (ac power being used)
      # or on_ac_power returns 255 (undefined, desktop machine without APM)
-    start-stop-daemon --start --exec /usr/sbin/anacron -- -s
+    start-stop-daemon --start --exec /usr/sbin/anacron -- $ANACRON_ARGS
      log_end_msg 0
      ;;
    restart|force-reload|reload)
@@ -54,7 +54,7 @@ case "$1" in
          exit 0
      fi
      log_daemon_msg "Stopping anac(h)ronistic cron" "anacron"
-    start-stop-daemon --stop --exec /usr/sbin/anacron --oknodo --quiet
+    start-stop-daemon --stop --exec /usr/sbin/anacron --oknodo --quiet --retry=USR1/90/TERM/5/KILL/5
      log_end_msg 0
      ;;
    status)
diff --git a/init.d/apparmor b/init.d/apparmor

index 208abca9ca98e9608bd708f6ffc1dae243d422d5..f8a2453b5627bf45cfb514585c7eea27ad56ebee 100755 (executable)
--- a/init.d/apparmor
+++ b/init.d/apparmor
@@ -22,6 +22,10 @@
  #
  # /etc/init.d/apparmor
  #
+# Note: "Required-Start: $local_fs" implies that the cache may not be available
+# yet when /var is on a remote filesystem. The worst consequence this should
+# have is slowing down the boot.
+#
  ### BEGIN INIT INFO
  # Provides: apparmor
  # Required-Start: $local_fs
@@ -32,49 +36,75 @@
  # Description: AppArmor init script. This script loads all AppArmor profiles.
  ### END INIT INFO
  
-. /lib/apparmor/functions
+APPARMOR_FUNCTIONS=/lib/apparmor/rc.apparmor.functions
+
+# Functions needed by rc.apparmor.functions
+
  . /lib/lsb/init-functions
  
-usage() {
-    echo "Usage: $0 {start|stop|restart|reload|force-reload|status|recache}"
+aa_action() {
+       STRING=$1
+       shift
+       $*
+       rc=$?
+       if [ $rc -eq 0 ] ; then
+               aa_log_success_msg $"$STRING "
+       else
+               aa_log_failure_msg $"$STRING "
+       fi
+       return $rc
  }
  
-test -x ${PARSER} || exit 0 # by debian policy
-# LSM is built-in, so it is either there or not enabled for this boot
-test -d /sys/module/apparmor || exit 0
+aa_log_action_start() {
+       log_action_begin_msg $@
+}
  
-securityfs() {
-       # Need securityfs for any mode
-       if [ ! -d "${AA_SFS}" ]; then
-               if cut -d" " -f2,3 /proc/mounts | grep -q "^${SECURITYFS} securityfs"'$' ; then
-                       log_action_msg "AppArmor not available as kernel LSM."
-                       log_end_msg 1
-                       exit 1
-               else
-                       log_action_begin_msg "Mounting securityfs on ${SECURITYFS}"
-                       if ! mount -t securityfs none "${SECURITYFS}"; then
-                               log_action_end_msg 1
-                               log_end_msg 1
-                               exit 1
-                       fi
-               fi
-       fi
-       if [ ! -w "$AA_SFS"/.load ]; then
-               log_action_msg "Insufficient privileges to change profiles."
-               log_end_msg 1
-               exit 1
+aa_log_action_end() {
+       log_action_end_msg $@
+}
+
+aa_log_success_msg() {
+       log_success_msg $@
+}
+
+aa_log_warning_msg() {
+       log_warning_msg $@
+}
+
+aa_log_failure_msg() {
+       log_failure_msg $@
+}
+
+aa_log_skipped_msg() {
+       if [ -n "$1" ]; then
+               log_warning_msg "${1}: Skipped."
         fi
  }
  
-# Allow "recache" even when running on the liveCD
-if [ "$1" = "recache" ]; then
-       log_daemon_msg "Recaching AppArmor profiles"
-       recache_profiles
-       rc=$?
-       log_end_msg "$rc"
-       exit $rc
+aa_log_daemon_msg() {
+       log_daemon_msg $@
+}
+
+aa_log_end_msg() {
+       log_end_msg $@
+}
+
+# Source AppArmor function library
+if [ -f "${APPARMOR_FUNCTIONS}" ]; then
+       . ${APPARMOR_FUNCTIONS}
+else
+       aa_log_failure_msg "Unable to find AppArmor initscript functions"
+       exit 1
  fi
  
+usage() {
+    echo "Usage: $0 {start|stop|restart|reload|force-reload|status}"
+}
+
+test -x ${PARSER} || exit 0 # by debian policy
+# LSM is built-in, so it is either there or not enabled for this boot
+test -d /sys/module/apparmor || exit 0
+
  # do not perform start/stop/reload actions when running from liveCD
  test -d /rofs/etc/apparmor.d && exit 0
  
@@ -84,73 +114,38 @@ case "$1" in
                 if [ -x /usr/bin/systemd-detect-virt ] && \
                    systemd-detect-virt --quiet --container && \
                    ! is_container_with_internal_policy; then
-                       log_daemon_msg "Not starting AppArmor in container"
-                       log_end_msg 0
+                       aa_log_daemon_msg "Not starting AppArmor in container"
+                       aa_log_end_msg 0
                         exit 0
                 fi
-               log_daemon_msg "Starting AppArmor profiles"
-               securityfs
-               load_configured_profiles
-               rc=$?
-               log_end_msg "$rc"
-               ;;
-       stop)
-               log_daemon_msg "Clearing AppArmor profiles cache"
-               clear_cache
+               apparmor_start
                 rc=$?
-               log_end_msg "$rc"
-               cat >&2 <<EOM
-All profile caches have been cleared, but no profiles have been unloaded.
-Unloading profiles will leave already running processes permanently
-unconfined, which can lead to unexpected situations.
-
-To set a process to complain mode, use the command line tool
-'aa-complain'. To really tear down all profiles, run the init script
-with the 'teardown' option."
-EOM
-               ;;
-       teardown)
-               if [ -x /usr/bin/systemd-detect-virt ] && \
-                  systemd-detect-virt --quiet --container && \
-                  ! is_container_with_internal_policy; then
-                       log_daemon_msg "Not tearing down AppArmor in container"
-                       log_end_msg 0
-                       exit 0
-               fi
-               log_daemon_msg "Unloading AppArmor profiles"
-               securityfs
-               running_profile_names | while read profile; do
-                       if ! unload_profile "$profile" ; then
-                               log_end_msg 1
-                               exit 1
-                       fi
-               done
-               rc=0
-               log_end_msg $rc
                 ;;
         restart|reload|force-reload)
                 if [ -x /usr/bin/systemd-detect-virt ] && \
                    systemd-detect-virt --quiet --container && \
                    ! is_container_with_internal_policy; then
-                       log_daemon_msg "Not reloading AppArmor in container"
-                       log_end_msg 0
+                       aa_log_daemon_msg "Not starting AppArmor in container"
+                       aa_log_end_msg 0
                         exit 0
                 fi
-               log_daemon_msg "Reloading AppArmor profiles"
-               securityfs
-               clear_cache
-               load_configured_profiles
+               apparmor_restart
                 rc=$?
+               ;;
+       stop)
+               aa_log_daemon_msg "Leaving AppArmor profiles loaded"
+               cat >&2 <<EOM
+No profiles have been unloaded.
+
+Unloading profiles will leave already running processes permanently
+unconfined, which can lead to unexpected situations.
  
-               log_end_msg "$rc"
+To set a process to complain mode, use the command line tool
+'aa-complain'. To really tear down all profiles, run 'aa-teardown'."
+EOM
                 ;;
         status)
-               securityfs
-               if [ -x /usr/sbin/aa-status ]; then
-                       aa-status --verbose
-               else
-                       cat "$AA_SFS"/profiles
-               fi
+               apparmor_status
                 rc=$?
                 ;;
         *)
diff --git a/init.d/cron b/init.d/cron

index d09a505385eac4158484dc3b504b7773531bd08c..c90dc1e38285f06ad947b3e95c084d57d973fad0 100755 (executable)
--- a/init.d/cron
+++ b/init.d/cron
@@ -5,8 +5,8 @@
  # Provides:          cron
  # Required-Start:    $remote_fs $syslog $time
  # Required-Stop:     $remote_fs $syslog $time
-# Should-Start:      $network $named slapd autofs ypbind nscd nslcd winbind
-# Should-Stop:       $network $named slapd autofs ypbind nscd nslcd winbind
+# Should-Start:      $network $named slapd autofs ypbind nscd nslcd winbind sssd
+# Should-Stop:       $network $named slapd autofs ypbind nscd nslcd winbind sssd
  # Default-Start:     2 3 4 5
  # Default-Stop:
  # Short-Description: Regular background program processing daemon
diff --git a/init.d/cryptdisks b/init.d/cryptdisks

index 286bc181ca0c2376f3ada70fbd958cd7ddeafd3c..0cd4a831db11dad475ade9a429011f2877cf96a3 100755 (executable)
--- a/init.d/cryptdisks
+++ b/init.d/cryptdisks
@@ -16,8 +16,8 @@
  
  set -e
  
-if [ -r /lib/cryptsetup/cryptdisks.functions ]; then
-       . /lib/cryptsetup/cryptdisks.functions
+if [ -r /lib/cryptsetup/cryptdisks-functions ]; then
+       . /lib/cryptsetup/cryptdisks-functions
  else
         exit 0
  fi
diff --git a/init.d/cryptdisks-early b/init.d/cryptdisks-early

index 05e9c0e8f82ad5a4377c4a3a61f95ecfd5116c39..6498431ed16fb17abe9366a2a0307242e148d528 100755 (executable)
--- a/init.d/cryptdisks-early
+++ b/init.d/cryptdisks-early
@@ -16,8 +16,8 @@
  
  set -e
  
-if [ -r /lib/cryptsetup/cryptdisks.functions ]; then
-       . /lib/cryptsetup/cryptdisks.functions
+if [ -r /lib/cryptsetup/cryptdisks-functions ]; then
+       . /lib/cryptsetup/cryptdisks-functions
  else
         exit 0
  fi
@@ -25,9 +25,6 @@ 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/dbus b/init.d/dbus

index 4f41293fcf5c7a103ff78aae4804fd143311ce7c..105c83b80919a960167ffca2153b1d73d2fbf835 100755 (executable)
--- a/init.d/dbus
+++ b/init.d/dbus
@@ -67,6 +67,13 @@ start_it_up()
  
    create_machineid
  
+  # Force libnss-systemd to avoid trying to communicate via D-Bus, which
+  # is never going to work well from within dbus-daemon. systemd
+  # special-cases this internally, but we might need to do the same when
+  # booting with sysvinit if libnss-systemd is still installed.
+  # (Workaround for #940971)
+  export SYSTEMD_NSS_BYPASS_BUS=1
+
    log_daemon_msg "Starting $DESC" "$NAME"
    start-stop-daemon --start --quiet --pidfile $PIDFILE \
      --exec $DAEMON -- --system $PARAMS
diff --git a/init.d/ebtables b/init.d/ebtables

deleted file mode 100755 (executable)

index b800521..0000000
--- a/init.d/ebtables
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/bin/bash
-#
-# init script for the Ethernet Bridge filter tables
-#
-# Written by Dag Wieers <dag@wieers.com>
-# Modified by Rok Papez <rok.papez@arnes.si>
-#           Bart De Schuymer <bdschuym@pandora.be>
-# Adapted to Debian by Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>
-#
-# chkconfig: - 15 85
-# description: Ethernet Bridge filtering tables
-#
-### BEGIN INIT INFO
-# Provides:            ebtables
-# Required-Start:      
-# Required-Stop:       
-# Should-Start:                $local_fs
-# Should-Stop:         $local_fs
-# Default-Start:       S
-# Default-Stop:                0 1 6
-# Short-Description:   ebtables ruleset management
-# Description:         Saves and restores the state of the ebtables rulesets.
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-test -f /sbin/ebtables || exit 0
-
-EBTABLES_DUMPFILE_STEM=/etc/ebtables
-
-RETVAL=0
-prog="ebtables"
-desc="Ethernet bridge filtering"
-umask 0077
-
-#default configuration
-EBTABLES_MODULES_UNLOAD="yes"
-EBTABLES_LOAD_ON_START="no"
-EBTABLES_SAVE_ON_STOP="no"
-EBTABLES_SAVE_ON_RESTART="no"
-EBTABLES_SAVE_COUNTER="no"
-EBTABLES_BACKUP_SUFFIX="~"
-
-config=/etc/default/$prog
-[ -f "$config" ] && . "$config"
-
-function get_supported_tables() {
-       EBTABLES_SUPPORTED_TABLES=
-       /sbin/ebtables -t filter -L 2>&1 1>/dev/null | grep -q permission
-       if [ $? -eq 0 ]; then
-               log_failure_msg "Error: insufficient privileges to access the ebtables rulesets."
-               return
-       fi
-       for table in filter nat broute; do
-               /sbin/ebtables -t $table -L &> /dev/null
-               if [ $? -eq 0 ]; then
-                       EBTABLES_SUPPORTED_TABLES="${EBTABLES_SUPPORTED_TABLES} $table"
-               fi
-       done
-}
-
-function load() {
-       RETVAL=0
-       get_supported_tables
-       log_daemon_msg "Restoring ebtables rulesets"
-       for table in $EBTABLES_SUPPORTED_TABLES; do
-               log_progress_msg "$table"
-               if [ -s ${EBTABLES_DUMPFILE_STEM}.$table ]; then
-                       /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit
-                       RET=$?
-                       if [ $RET -ne 0 ]; then
-                               log_progress_msg "(failed)"
-                               RETVAL=$RET
-                       fi
-               else
-                       log_progress_msg "(no saved state)"
-               fi
-       done
-       if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
-               log_progress_msg "no kernel support"
-       else
-               log_progress_msg "done"
-       fi
-       log_end_msg $RETVAL
-}
-
-function clear() {
-       RETVAL=0
-       get_supported_tables
-       log_daemon_msg "Clearing ebtables rulesets"
-       for table in $EBTABLES_SUPPORTED_TABLES; do
-               log_progress_msg "$table"
-               /sbin/ebtables -t $table --init-table
-       done
-
-       if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then
-               for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -d' ' -f1) ebtables; do
-                       rmmod $mod 2> /dev/null
-               done
-       fi
-       if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
-               log_progress_msg "no kernel support"
-       else
-               log_progress_msg "done"
-       fi
-       log_end_msg $RETVAL
-}
-
-function save() {
-       RETVAL=0
-       get_supported_tables
-       log_daemon_msg "Saving ebtables rulesets"
-       for table in $EBTABLES_SUPPORTED_TABLES; do
-               log_progress_msg "$table"
-               [ -n "$EBTABLES_BACKUP_SUFFIX" ] && [ -s ${EBTABLES_DUMPFILE_STEM}.$table ] && \
-                 mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX
-               /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save
-               RET=$?
-               if [ $RET -ne 0 ]; then
-                       log_progress_msg "(failed)"
-                       RETVAL=$RET
-               else
-                       if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then
-                               /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z
-                       fi
-               fi
-       done
-       if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
-               log_progress_msg "no kernel support"
-       else
-               log_progress_msg "done"
-       fi
-       log_end_msg $RETVAL
-}
-
-case "$1" in
-  start)
-       [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load
-       ;;
-  stop)
-       [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save
-       clear
-       # Never return failure for stop; it's not helpful, and causes problems
-       # in some cases during pkg upgrade, e.g. LP: #1774120
-       RETVAL=0
-       ;;
-  restart|reload|force-reload)
-       [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
-       clear
-       [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load
-       ;;
-  load)
-       load
-       ;;
-  save)
-       save
-       ;;
-  status)
-       get_supported_tables
-       if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
-               log_failure_msg "No kernel support for ebtables."
-               RETVAL=1
-       else
-               log_daemon_msg "Ebtables support available, number of installed rules"
-               for table in $EBTABLES_SUPPORTED_TABLES; do
-                       COUNT=$(( $(/sbin/ebtables -t $table -L | sed -e "/^Bridge chain/! d" -e "s/^.*entries: //" -e "s/,.*$/ +/") 0 ))
-                       log_progress_msg "$table($COUNT)"
-               done
-               log_end_msg 0
-               RETVAL=0
-       fi
-       ;;
-  *)
-       echo "Usage: $0 {start|stop|restart|reload|force-reload|load|save|status}" >&2
-       RETVAL=1
-esac
-
-exit $RETVAL
diff --git a/init.d/g15daemon b/init.d/g15daemon

index 742e3289a420444534da55fe069eb652403be180..f3135c3f3481e77c2817b6ea9bcbb95189c82045 100755 (executable)
--- a/init.d/g15daemon
+++ b/init.d/g15daemon
@@ -2,8 +2,8 @@
  
  ### BEGIN INIT INFO
  # Provides:          g15daemon
-# Required-Start:    $syslog $local_fs
-# Required-Stop:     $syslog $local_fs
+# Required-Start:    $syslog $local_fs $remote_fs
+# Required-Stop:     $syslog $local_fs $remote_fs
  # Should-Start:      $remote_fs
  # Should-Stop:       $remote_fs
  # X-Start-Before:    xdm kdm gdm ldm sdm
@@ -17,21 +17,17 @@
  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
  DAEMON=/usr/sbin/g15daemon
  NAME=g15daemon
-DESC=g15daemon
+DESC="Logitech G15 keyboard LCD multiplexer"
  
  [ -x "$DAEMON" ] || exit 0
  
+. /lib/lsb/init-functions
+
  # Include g15daemon defaults if available
  if [ -f /etc/default/g15daemon ] ; then
-       . /etc/default/g15daemon
-fi
-
-if [ "$SWITCH_KEY" = "MR" ]; then
-       DAEMON_OPTS="-s $DAEMON_OPTS"
+    . /etc/default/g15daemon
  fi
  
-set -e
-
  if [ "$G15DEBUG" = "on" ]; then
  
  log() {
@@ -45,133 +41,85 @@ log() {
  
  fi
  
-
-
-
-wait_for_file() {
-        local file=$1
-        local timeout=$2
-        [ "$timeout" ] || timeout=120
-
-        local count=$(($timeout * 10))
-        while [ $count != 0 ]; do
-                [ -e "$file" ] && return 0
-                sleep 0.1
-                count=$(($count - 1))
-        done
-       return 1
-}
-
-load_uinput() {
-    if [ ! -e /dev/input/uinput ] ; then
-        modprobe -q uinput || true
-       wait_for_file /dev/input/uinput 3  ||  return 1
+check_new_init() {
+    if [ -d /run/systemd/system ] ; then
+        exit $1
      fi
  }
  
-wait_usr_mount() {
-    if [ ! -e "$DAEMON" ] ; then
-        wait_for_file "$DAEMON" 7  ||  return 1
+load_uinput() {
+    if [ ! -e /dev/uinput ] ; then
+        modprobe -q uinput
+        udevadm settle -t 5 -E /dev/uinput
+        [ -e /dev/uinput 3 ] || return 1
      fi
  }
  
  is_running() {
-       start-stop-daemon --stop --test --quiet --pidfile \
-                /var/run/$NAME.pid --exec $DAEMON 
+   start-stop-daemon --stop --test --quiet --pidfile \
+        /var/run/$NAME.pid --exec $DAEMON
  }
  
  do_start() {
-        start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-                --exec $DAEMON -- $DAEMON_OPTS
+    start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
+        --exec $DAEMON -- $DAEMON_OPTS
  }
  
  do_stop() {
-        $DAEMON -k
-        start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-                --oknodo --retry 5 --exec $DAEMON
+    start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+        --oknodo --retry 5 --exec $DAEMON
  }
  
-
  case "$1" in
-  start)
-       echo -n "Starting $DESC: "
-       load_uinput || echo -n ".../dev/input/uinput not found ..."
-       do_start
-       echo "$NAME."
-       ;;
-  stop)
-       echo -n "Stopping $DESC: "
-       do_stop
-       echo "$NAME."
-       ;;
-  #reload)
-       #
-       #       If the daemon can reload its config files on the fly
-       #       for example by sending it SIGHUP, do it here.
-       #
-       #       If the daemon responds to changes in its config file
-       #       directly anyway, make this a do-nothing entry.
-       #
-       # echo "Reloading $DESC configuration files."
-       # start-stop-daemon --stop --signal 1 --quiet --pidfile \
-       #       /var/run/$NAME.pid --exec $DAEMON
-       #;;
-  force-reload)
-       #
-       #       If the "reload" option is implemented, move the "force-reload"
-       #       option to the "reload" entry above. If not, "force-reload" is
-       #       just the same as "restart" except that it does nothing if the
-       #   daemon isn't already running.
-       # check wether $DAEMON is running. If so, restart
-       is_running  &&  $0 restart  ||  exit 0
+    start)
+        log_daemon_msg "Starting $DESC" $NAME
+        load_uinput || log_warning_msg "/dev/uinput not found"
+        do_start
+        log_end_msg $?
          ;;
-  restart)
-    echo -n "Restarting $DESC: "
-       do_stop
-       # the device is slow to shut-down
-       sleep 1
-       do_start
-       echo "$NAME."
-       ;;
-  udev)
-       log "calling g15 udev; action: $ACTION, product $PRODUCT"
-       if [ "x$ACTION" = "xadd" ] ; then
-           load_uinput || true
-           wait_usr_mount || true
-           # it seems udev will not release a device if userspace is still
-           # connected
-           is_running && ( do_stop; sleep 1 )
-           do_start
-       elif [ "x$ACTION" = "xremove" ] ; then
-           do_stop
-       else
-           echo "unknow udev action '$ACTION'"
-           exit 1
-
-       fi
-       ;;
-  shared-udev)
-        # some devices share usb also for audio, which causes some spourios
-        # udev messages.
-        log "calling g15 shared-dev; action: $ACTION, product $PRODUCT"
-        if [ "x$ACTION" = "xadd" ] ; then
-            load_uinput || true
-            wait_usr_mount || true
-            do_start
-        elif [ "x$ACTION" = "xremove" ] ; then
-            do_stop
+    stop)
+        log_daemon_msg "Stopping $DESC" $NAME
+        if do_stop ; then
+            log_end_msg 0
          else
-            echo "unknow udev action '$ACTION'"
+            log_end_msg 1
              exit 1
-
          fi
          ;;
-
-  *)
-       N=/etc/init.d/$NAME
-       echo "Usage: $N {start|stop|restart|force-reload|udev}" >&2
-       exit 1
-       ;;
+    force-reload)
+        is_running && $0 restart || exit 0
+        ;;
+    restart)
+        log_daemon_msg "Restarting $DESC" $NAME
+        if ! do_stop ; then
+            log_end_msg 1
+            exit 1
+        fi
+        # the device is slow to shut-down
+        sleep 1
+        load_uinput || log_warning_msg "/dev/uinput not found"
+        do_start
+        log_end_msg $?
+        ;;
+    status)
+        is_running
+        exit $?
+        ;;
+    udev)
+        check_new_init 0
+        log "calling g15 udev; action: $ACTION, product $PRODUCT"
+        if [ "x$ACTION" = "xadd" ] ; then
+            # If g15daemon is running, it will handle replugging.
+            is_running && exit 0
+            load_uinput
+            do_start
+        fi
+        ;;
+    *)
+        N=/etc/init.d/$NAME
+        log_action_msg "Usage: $N {start|stop|restart|force-reload|status}"
+        exit 1
+        ;;
  esac
  
  exit 0
diff --git a/init.d/networking b/init.d/networking

index ec00e979be7f8e7e0f44987b8e0225ca224d72c4..b5380511c9f1b14551b64ebeaa1bf139f67f5c98 100755 (executable)
--- a/init.d/networking
+++ b/init.d/networking
@@ -119,9 +119,6 @@ ifup_hotplug () {
  
  case "$1" in
  start)
-       if init_is_upstart; then
-               exit 1
-       fi
         process_options
         check_ifstate
  
@@ -133,9 +130,9 @@ start)
         set -f
         exclusions=$(process_exclusions)
         log_action_begin_msg "Configuring network interfaces"
-       if [ -x /sbin/udevadm ]; then
+       if [ -x /bin/udevadm ]; then
                 if [ -n "$(ifquery --list --exclude=lo)" ] || [ -n "$(ifquery --list --allow=hotplug)" ]; then
-                       udevadm settle || true
+                       /bin/udevadm settle || true
                 fi
         fi
         if ifup -a $exclusions $verbose && ifup_hotplug $exclusions $verbose
@@ -147,9 +144,6 @@ start)
         ;;
  
  stop)
-       if init_is_upstart; then
-               exit 0
-       fi
         check_network_file_systems
         check_network_swap
  
@@ -162,9 +156,6 @@ stop)
         ;;
  
  reload)
-       if init_is_upstart; then
-               exit 1
-       fi
         process_options
  
         log_action_begin_msg "Reloading network interfaces configuration"
@@ -178,9 +169,6 @@ reload)
         ;;
  
  force-reload|restart)
-       if init_is_upstart; then
-               exit 1
-       fi
         process_options
  
         log_warning_msg "Running $0 $1 is deprecated because it may not re-enable some interfaces"
diff --git a/init.d/rsync b/init.d/rsync

index 3bf5167b52675b17844d35a87ac3f0fce982a6ff..3cb044771da4a4258ac57c4d4ba9cf8693ff7bc1 100755 (executable)
--- a/init.d/rsync
+++ b/init.d/rsync
@@ -111,8 +111,13 @@ case "$1" in
         ;;
    stop)
         log_daemon_msg "Stopping rsync daemon" "rsync"
-       start-stop-daemon --stop --quiet --oknodo --pidfile $RSYNC_PID_FILE
-       log_end_msg $?
+       start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile $RSYNC_PID_FILE
+       RETVAL="$?"
+       log_end_msg $RETVAL
+       if [ $RETVAL != 0 ]
+       then
+               exit 1
+       fi
         rm -f $RSYNC_PID_FILE
         ;;
  
@@ -126,8 +131,7 @@ case "$1" in
         if $RSYNC_ENABLE; then
             log_daemon_msg "Restarting rsync daemon" "rsync"
             if [ -s $RSYNC_PID_FILE ] && kill -0 $(cat $RSYNC_PID_FILE) >/dev/null 2>&1; then
-               start-stop-daemon --stop --quiet --oknodo --pidfile $RSYNC_PID_FILE || true
-               sleep 1
+               start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile $RSYNC_PID_FILE
             else
                 log_warning_msg "rsync daemon not running, attempting to start."
                 rm -f $RSYNC_PID_FILE
diff --git a/init.d/speech-dispatcher b/init.d/speech-dispatcher

index 27bcce2eaa676d93b9292509517f301e97d12e6e..ba6f52808086f24ecb85ffb403c537b90d6d3547 100755 (executable)
--- a/init.d/speech-dispatcher
+++ b/init.d/speech-dispatcher
@@ -14,7 +14,7 @@
  
  PATH=/sbin:/bin:/usr/sbin:/usr/bin
  DAEMON=/usr/bin/speech-dispatcher
-PIDFILE=/var/run/speech-dispatcher/speech-dispatcher.pid
+PIDFILE=/run/speech-dispatcher/speech-dispatcher.pid
  NAME=speech-dispatcher
  DESC='Speech Dispatcher'
  USER=speech-dispatcher
@@ -23,18 +23,6 @@ test -f $DAEMON || exit 0
  
  . /lib/lsb/init-functions
  
-RUN=no
-
-# Include speech-dispatcher defaults if available
-if [ -f /etc/default/speech-dispatcher ] ; then
-    . /etc/default/speech-dispatcher
-fi
-
-if [ "x$RUN" != "xyes" ] ; then
-    log_action_msg "$NAME disabled; edit /etc/default/speech-dispatcher"
-    exit 0
-fi
-
  set -e
  
  do_start () {
@@ -44,6 +32,10 @@ do_start () {
    [ -e $SDDIR ] || ln -s $PIDDIR $SDDIR
    LOGDIR=$SDDIR/log
    [ -e $LOGDIR ] || ln -s /var/log/speech-dispatcher $LOGDIR
+  CACHEDIR=$SDDIR/.cache
+  [ -e $CACHEDIR ] || install -d -ospeech-dispatcher -gaudio -m750 $CACHEDIR
+  CACHEDIR2=$CACHEDIR/speech-dispatcher
+  [ -e $CACHEDIR2 ] || ln -s $SSDIR $CACHEDIR2
    start-stop-daemon --oknodo --start --quiet --chuid $USER --pidfile $PIDFILE \
      --exec $DAEMON -- --pid-file $PIDFILE
  }
diff --git a/init/anacron.conf b/init/anacron.conf

deleted file mode 100644 (file)

index d2bae55..0000000
--- a/init/anacron.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# anacron - anac(h)ronistic cron
-#
-# anacron executes commands at specific periods, but does not assume that
-# the machine is running continuously
-
-description    "anac(h)ronistic cron"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-expect fork
-normal exit 0
-
-exec anacron -s
diff --git a/iptables/rules.v4 b/iptables/rules.v4

index 4d52e1b0c230f24eadfaa19f2efa6c470e59b0d1..9bb97159cdca93a8216c62f5b7f5ef89da7a4ce2 100644 (file)
--- a/iptables/rules.v4
+++ b/iptables/rules.v4
@@ -1,7 +1,30 @@
-# Generated by iptables-save v1.6.1 on Sun May  3 17:28:32 2020
+# Generated by iptables-save v1.6.1 on Tue Jul 21 11:35:25 2020
+*mangle
+:PREROUTING ACCEPT [285143:2890357901]
+:INPUT ACCEPT [284823:2890326400]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [233316:16569840]
+:POSTROUTING ACCEPT [238248:16922215]
+-A POSTROUTING -o virbr0 -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill
+COMMIT
+# Completed on Tue Jul 21 11:35:25 2020
+# Generated by iptables-save v1.6.1 on Tue Jul 21 11:35:25 2020
+*nat
+:PREROUTING ACCEPT [1074:101910]
+:INPUT ACCEPT [754:70409]
+:OUTPUT ACCEPT [5389:415625]
+:POSTROUTING ACCEPT [5388:415479]
+-A POSTROUTING -s 192.168.122.0/24 -d 224.0.0.0/24 -j RETURN
+-A POSTROUTING -s 192.168.122.0/24 -d 255.255.255.255/32 -j RETURN
+-A POSTROUTING -s 192.168.122.0/24 ! -d 192.168.122.0/24 -p tcp -j MASQUERADE --to-ports 1024-65535
+-A POSTROUTING -s 192.168.122.0/24 ! -d 192.168.122.0/24 -p udp -j MASQUERADE --to-ports 1024-65535
+-A POSTROUTING -s 192.168.122.0/24 ! -d 192.168.122.0/24 -j MASQUERADE
+COMMIT
+# Completed on Tue Jul 21 11:35:25 2020
+# Generated by iptables-save v1.6.1 on Tue Jul 21 11:35:25 2020
  *filter
-:INPUT ACCEPT [15:144216]
+:INPUT ACCEPT [157:39746]
  :FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [13:712]
+:OUTPUT ACCEPT [181:27966]
  COMMIT
-# Completed on Sun May  3 17:28:32 2020
+# Completed on Tue Jul 21 11:35:25 2020
diff --git a/iptables/rules.v6 b/iptables/rules.v6

index a78d1e12ccdf84fd76b26432deedc1a5bfd276fb..4b4deaab9c993b1784c5e6167c2640300ec7a7e1 100644 (file)
--- a/iptables/rules.v6
+++ b/iptables/rules.v6
@@ -1,7 +1,7 @@
-# Generated by ip6tables-save v1.6.1 on Sun May  3 17:28:32 2020
+# Generated by ip6tables-save v1.6.1 on Tue Jul 21 11:35:25 2020
  *filter
  :INPUT ACCEPT [0:0]
  :FORWARD ACCEPT [0:0]
  :OUTPUT ACCEPT [0:0]
  COMMIT
-# Completed on Sun May  3 17:28:32 2020
+# Completed on Tue Jul 21 11:35:25 2020
diff --git a/kernel/prerm.d/dkms b/kernel/prerm.d/dkms

index a7f93a12577c491b3c5d1a283af569613e8a79ee..c8116a398cc883c314e5a06ae32845304c91c809 100755 (executable)
--- a/kernel/prerm.d/dkms
+++ b/kernel/prerm.d/dkms
@@ -1,14 +1,14 @@
  #!/bin/bash
  
-# We're passed the version of the kernel being installed
+# We're passed the version of the kernel being removed
  inst_kern=$1
  
  # This is applied from make_initrd function in dkms command, which
  # creates the possible initrd backup file.
  remove_initrd_backup() {
-    for initrd in "initrd-$1.img" "initramfs-$1.img" "initrd.img-$1" "initrd-$1"; do
-        rm -fv /boot/"${initrd}".old-dkms >&2
-    done
+       for initrd in "initrd-$1.img" "initramfs-$1.img" "initrd.img-$1" "initrd-$1"; do
+               rm -fv /boot/"${initrd}".old-dkms >&2
+       done
  }
  
  if [ -x /usr/sbin/dkms ]; then
diff --git a/lightdm/users.conf b/lightdm/users.conf

index e4948a629d7bb83d387b81ed635f1785a9c79041..5c01993134689d54592c26078e9577b093ca39c8 100644 (file)
--- a/lightdm/users.conf
+++ b/lightdm/users.conf
@@ -11,4 +11,4 @@
  [UserList]
  minimum-uid=500
  hidden-users=nobody nobody4 noaccess
-hidden-shells=/bin/false /usr/sbin/nologin
+hidden-shells=/bin/false /usr/sbin/nologin /sbin/nologin
diff --git a/linuxmint/info b/linuxmint/info

index 594a8787639f22f42dbd33d2460e6818dd9ff12b..8e24a37ec1e745c0ed122e5ca362a629a07eac87 100644 (file)
--- a/linuxmint/info
+++ b/linuxmint/info
@@ -1,10 +1,10 @@
-RELEASE=19.3
-CODENAME=tricia
+RELEASE=20
+CODENAME=ulyana
  EDITION="MATE"
-DESCRIPTION="Linux Mint 19.3 Tricia"
+DESCRIPTION="Linux Mint 20 Ulyana"
  DESKTOP=Gnome
  TOOLKIT=GTK
-NEW_FEATURES_URL=https://www.linuxmint.com/rel_tricia_mate_whatsnew.php
-RELEASE_NOTES_URL=https://www.linuxmint.com/rel_tricia_mate.php
+NEW_FEATURES_URL=https://www.linuxmint.com/rel_ulyana_mate_whatsnew.php
+RELEASE_NOTES_URL=https://www.linuxmint.com/rel_ulyana_mate.php
  USER_GUIDE_URL=https://www.linuxmint.com/documentation.php
-GRUB_TITLE=Linux Mint 19.3 MATE
+GRUB_TITLE=Linux Mint 20 MATE
diff --git a/logcheck/ignore.d.server/rsyslog b/logcheck/ignore.d.server/rsyslog

index e5f9b3bc63d7f653d0bab50acbbae5075f13a6ca..c29d5bf4ed1f21c143b701a9d6c334ba8cb3be34 100644 (file)
--- a/logcheck/ignore.d.server/rsyslog
+++ b/logcheck/ignore.d.server/rsyslog
@@ -1,6 +1,5 @@
  ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel: imklog [0-9.]+, log source = /proc/kmsg started.$
  ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ kernel: Kernel logging \(proc\) stopped.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ rsyslogd: \[origin software="rsyslogd" swVersion="[0-9.]+" x-pid="[0-9]+" x-info="http://www.rsyslog.com"\] start$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ rsyslogd: \[origin software="rsyslogd" swVersion="[0-9.]+" x-pid="[0-9]+" x-info="http://www.rsyslog.com"\] exiting on signal [0-9]+.$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ rsyslogd: \[origin software="rsyslogd" swVersion="[0-9.]+" x-pid="[0-9]+" x-info="http://www.rsyslog.com"\] rsyslogd was HUPed$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ systemd-tmpfiles\[[0-9]+\]: \[/usr/lib/tmpfiles.d/var.conf:[0-9]+\] Duplicate line for path "/var/log", ignoring\.$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ rsyslogd: \[origin software="rsyslogd" swVersion="[0-9.]+" x-pid="[0-9]+" x-info="https://www.rsyslog.com"\] start$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ rsyslogd: \[origin software="rsyslogd" swVersion="[0-9.]+" x-pid="[0-9]+" x-info="https://www.rsyslog.com"\] exiting on signal [0-9]+.$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ rsyslogd: \[origin software="rsyslogd" swVersion="[0-9.]+" x-pid="[0-9]+" x-info="https://www.rsyslog.com"\] rsyslogd was HUPed$
diff --git a/logrotate.conf b/logrotate.conf

index 1a929ebe2520e75ab9f26715ebe4c7e0ca2e236f..19eefe12181345a727e23080e7547b5e8e20635f 100644 (file)
--- a/logrotate.conf
+++ b/logrotate.conf
@@ -2,35 +2,23 @@
  # rotate log files weekly
  weekly
  
-# use the syslog group by default, since this is the owning group
+# use the adm group by default, since this is the owning group
  # of /var/log/syslog.
-su root syslog
+su root adm
  
  # keep 4 weeks worth of backlogs
-rotate 10
-maxage 731
+rotate 4
  
  # create new (empty) log files after rotating old ones
  create
  
-# use date as a suffix of the rotated file.
-dateext
-dateformat -%Y-%m-%d
-
-# do not rotate, if the file is empty
-notifempty
+# use date as a suffix of the rotated file
+#dateext
  
  # uncomment this if you want your log files compressed
-compress
-delaycompress
-
-# is it okay, if a logfile doesn't exists ?
-missingok
-
-#nomail
-noolddir
+#compress
  
  # packages drop log rotation information into this directory
  include /etc/logrotate.d
  
-# system-specific logs may be configured here
+# system-specific logs may be also be configured here.
diff --git a/logrotate.d/btmp b/logrotate.d/btmp

index 2e5f092a3d81de70643c1723412b72e226b2b328..0aa1ae1ade1842b8fb36182292e96a13a553a661 100644 (file)
--- a/logrotate.d/btmp
+++ b/logrotate.d/btmp
@@ -1,11 +1,7 @@
  # no packages own btmp -- we'll rotate it here
  /var/log/btmp {
      missingok
-    weekly
+    monthly
      create 0660 root utmp
-    minsize 4M
-    rotate 12
-    dateext
-    dateformat -%Y-%m-%d
+    rotate 1
  }
-
diff --git a/logrotate.d/speech-dispatcher b/logrotate.d/speech-dispatcher

index 9e5e44f79022cc26c04d694fa72c51fdde507f86..63f2f326667fb2d6d55d22de672b6979f77ede77 100644 (file)
--- a/logrotate.d/speech-dispatcher
+++ b/logrotate.d/speech-dispatcher
@@ -5,7 +5,7 @@
    sharedscripts
    rotate 7
    postrotate
-    /usr/sbin/invoke-rc.d speech-dispatcher reload >/dev/null
+    ! /usr/sbin/invoke-rc.d --quiet speech-dispatcher status > /dev/null || /usr/sbin/invoke-rc.d speech-dispatcher reload >/dev/null
    endscript
  }
  
@@ -16,6 +16,6 @@
    sharedscripts
    rotate 2
    postrotate
-    /usr/sbin/invoke-rc.d speech-dispatcher reload >/dev/null
+    ! /usr/sbin/invoke-rc.d --quiet speech-dispatcher status > /dev/null || /usr/sbin/invoke-rc.d speech-dispatcher reload >/dev/null
    endscript
  }
diff --git a/logrotate.d/ubuntu-advantage-tools b/logrotate.d/ubuntu-advantage-tools

new file mode 100644 (file)

index 0000000..1dede3f
--- /dev/null
+++ b/logrotate.d/ubuntu-advantage-tools
@@ -0,0 +1,8 @@
+/var/log/ubuntu-advantage.log {
+    rotate 6
+    monthly
+    compress
+    delaycompress
+    missingok
+    notifempty
+}
diff --git a/logrotate.d/wtmp b/logrotate.d/wtmp

index bf86f2329983e43e6bd7492cbbfd2cbcaeadeec6..cc8a151e00befe3d6a4182e7f24705817facd631 100644 (file)
--- a/logrotate.d/wtmp
+++ b/logrotate.d/wtmp
@@ -1,11 +1,8 @@
-# no packages own wtmp, or btmp -- we'll rotate them here
+# no packages own wtmp -- we'll rotate it here
  /var/log/wtmp {
      missingok
-    weekly
+    monthly
      create 0664 root utmp
-    rotate 12
-    minsize 4M
-    dateext
-    dateformat -%Y-%m-%d
+    minsize 1M
+    rotate 1
  }
-
diff --git a/mailcap b/mailcap

index c5c16255c8b8a4934d51bc3b084522143a669ed2..d298edbabc11bb2625a374a0db6f522b270b0f09 100644 (file)
--- a/mailcap
+++ b/mailcap
@@ -155,7 +155,6 @@ application/x-7z-compressed; engrampa %s; test=test -n "$DISPLAY"
  application/x-7z-compressed-tar; engrampa %s; test=test -n "$DISPLAY"
  application/x-ace; engrampa %s; test=test -n "$DISPLAY"
  application/x-alz; engrampa %s; test=test -n "$DISPLAY"
-application/x-ar; engrampa %s; test=test -n "$DISPLAY"
  application/x-arj; engrampa %s; test=test -n "$DISPLAY"
  application/x-brotli; engrampa %s; test=test -n "$DISPLAY"
  application/x-brotli-compressed-tar; engrampa %s; test=test -n "$DISPLAY"
@@ -170,7 +169,7 @@ application/x-cd-image; engrampa %s; test=test -n "$DISPLAY"
  application/x-compress; engrampa %s; test=test -n "$DISPLAY"
  application/x-compressed-tar; engrampa %s; test=test -n "$DISPLAY"
  application/x-cpio; engrampa %s; test=test -n "$DISPLAY"
-application/x-deb; engrampa %s; test=test -n "$DISPLAY"
+application/vnd.debian.binary-package; engrampa %s; test=test -n "$DISPLAY"
  application/x-ear; engrampa %s; test=test -n "$DISPLAY"
  application/x-ms-dos-executable; engrampa %s; test=test -n "$DISPLAY"
  application/x-gtar; engrampa %s; test=test -n "$DISPLAY"
@@ -178,7 +177,7 @@ application/x-gzip; engrampa %s; test=test -n "$DISPLAY"
  application/x-gzpostscript; engrampa %s; test=test -n "$DISPLAY"
  application/x-java-archive; engrampa %s; test=test -n "$DISPLAY"
  application/x-lha; engrampa %s; test=test -n "$DISPLAY"
-application/x-lhz; engrampa %s; test=test -n "$DISPLAY"
+application/x-lzh-compressed; engrampa %s; test=test -n "$DISPLAY"
  application/x-lrzip; engrampa %s; test=test -n "$DISPLAY"
  application/x-lrzip-compressed-tar; engrampa %s; test=test -n "$DISPLAY"
  application/x-lzip; engrampa %s; test=test -n "$DISPLAY"
@@ -191,6 +190,7 @@ application/x-ms-wim; engrampa %s; test=test -n "$DISPLAY"
  application/x-rar; engrampa %s; test=test -n "$DISPLAY"
  application/x-rar-compressed; engrampa %s; test=test -n "$DISPLAY"
  application/x-rpm; engrampa %s; test=test -n "$DISPLAY"
+application/x-source-rpm; engrampa %s; test=test -n "$DISPLAY"
  application/x-rzip; engrampa %s; test=test -n "$DISPLAY"
  application/x-tar; engrampa %s; test=test -n "$DISPLAY"
  application/x-tarz; engrampa %s; test=test -n "$DISPLAY"
@@ -201,6 +201,8 @@ application/x-xz-compressed-tar; engrampa %s; test=test -n "$DISPLAY"
  application/x-zip; engrampa %s; test=test -n "$DISPLAY"
  application/x-zip-compressed; engrampa %s; test=test -n "$DISPLAY"
  application/x-zoo; engrampa %s; test=test -n "$DISPLAY"
+application/x-zstd; engrampa %s; test=test -n "$DISPLAY"
+application/x-zstd-compressed-tar; engrampa %s; test=test -n "$DISPLAY"
  application/zip; engrampa %s; test=test -n "$DISPLAY"
  application/x-archive; engrampa %s; test=test -n "$DISPLAY"
  application/vnd.ms-cab-compressed; engrampa %s; test=test -n "$DISPLAY"
diff --git a/menu-methods/xdg-desktop-entry-spec-sessions b/menu-methods/xdg-desktop-entry-spec-sessions

index 06603d2ea08ffacb56f3d999c579d7503d6e4148..2144f483975c46502e2835383f006aa443cb12eb 100755 (executable)
--- a/menu-methods/xdg-desktop-entry-spec-sessions
+++ b/menu-methods/xdg-desktop-entry-spec-sessions
@@ -11,7 +11,7 @@ compat="menu-2"
  outputencoding="UTF-8";
  outputlanguage="C";
  
-function has_session() = shell("grep -l -e '^/usr/share/xsessions/' '/var/lib/dpkg/info/" $package ".list' 2>/dev/null");
+function has_session() = shell("dpkg-query --listfiles '" $package "' 2>/dev/null | grep -qe '^/usr/share/xsessions/' && echo yes");
  
  function name() =
         "Name=" title() "\n"
diff --git a/mime.types b/mime.types

index 3f31ff24a8dbe31227e063085abfcf5e76758cfc..8e26dee9ddb419a123d25fb350e95dca091c8ddb 100644 (file)
--- a/mime.types
+++ b/mime.types
@@ -49,6 +49,7 @@ application/ecmascript                                es
  application/edi-consent
  application/edi-x12
  application/edifact
+application/epub+zip                           epub
  application/eshop
  application/font-sfnt                          otf ttf
  application/font-tdpfr                         pfr
@@ -71,8 +72,9 @@ application/isup
  application/java-archive                       jar
  application/java-serialized-object             ser
  application/java-vm                            class
-application/javascript                         js
+application/javascript                         js mjs
  application/json                               json
+application/ld+json                            jsonld
  application/m3g                                        m3g
  application/mac-binhex40                       hqx
  application/mac-compactpro                     cpt
@@ -129,6 +131,7 @@ application/smil+xml                                smi smil
  application/timestamp-query
  application/timestamp-reply
  application/vemmi
+application/wasm                                wasm
  application/whoispp-query
  application/whoispp-response
  application/wita
@@ -624,6 +627,13 @@ chemical/x-vmd                                     vmd
  chemical/x-xtel                                        xtel
  chemical/x-xyz                                 xyz
  
+font/collection                                        ttc
+font/otf                                       ttf otf
+font/sfnt                                      ttf otf
+font/ttf                                       ttf otf
+font/woff                                      woff
+font/woff2                                     woff2
+
  image/cgm
  image/g3fax
  image/gif                                      gif
diff --git a/modprobe.d/blacklist.conf b/modprobe.d/blacklist.conf

index 706e63c92ee85ab10927890ba171f13c7ffc9938..eecdf12865475957b88061e78e4967229d01ec16 100644 (file)
--- a/modprobe.d/blacklist.conf
+++ b/modprobe.d/blacklist.conf
@@ -25,10 +25,6 @@ blacklist snd_intel8x0m
  # Conflicts with dvb driver (which is better for handling this device)
  blacklist snd_aw2
  
-# Causes trackpads to stop working on Lenovo 11e 2nd gen (Ubuntu: #1802135)
-# and Lenovo x240 to hang on boot (Ubuntu: #1802689)
-blacklist i2c_i801
-
  # replaced by p54pci
  blacklist prism54
  
diff --git a/needrestart/hook.d/10-dpkg b/needrestart/hook.d/10-dpkg

index 6c6157cb03fd1481e6072dcecde11e747cb47ec6..db3d7b3608802a3769e63388af51f550b2434c68 100755 (executable)
--- a/needrestart/hook.d/10-dpkg
+++ b/needrestart/hook.d/10-dpkg
@@ -78,7 +78,8 @@ foreach my $pkg (@pkgs) {
  
      my $plist = fork_pipe(qw(dpkg-query --listfiles), $pkg);
      while(<$plist>) {
-       print "RC|$1\n" if(m@^/etc/init.d/(.+)$@);
+        chomp;
+        print "RC|$1\n" if(m@^/etc/init.d/(.+)$@ && -x $_);
      }
      close($plist);
  }
diff --git a/needrestart/hook.d/20-rpm b/needrestart/hook.d/20-rpm

index 2d7d7ed3fcbd87002bf63815c76d581b36e72bd1..1e74ce2389648a38a765d9311157d457e468e83e 100755 (executable)
--- a/needrestart/hook.d/20-rpm
+++ b/needrestart/hook.d/20-rpm
@@ -73,7 +73,8 @@ foreach my $pkg (@pkgs) {
  
      my $plist = fork_pipe(qw(rpm -q --filesbypkg), $pkg);
      while(<$plist>) {
-       print "RC|$2\n" if(m@^\S+\s+/etc(/rc\.d)?/init\.d/(.+)$@);
+        chomp;
+        print "RC|$2\n" if(m@^\S+\s+/etc(/rc\.d)?/init\.d/(.+)$@ && -x $_);
      }
      close($plist);
  }
diff --git a/needrestart/needrestart.conf b/needrestart/needrestart.conf

index 49279a9824f8392de708561b84b0cbcac659eae3..7503a8b01a08400fa74b0f7461b0174488fb80d7 100644 (file)
--- a/needrestart/needrestart.conf
+++ b/needrestart/needrestart.conf
@@ -98,11 +98,14 @@ $nrconf{override_rc} = {
  
      # networking stuff
      qr(^bird) => 0,
+    qr(^networking) => 0,
      qr(^network-manager) => 0,
      qr(^NetworkManager) => 0,
+    qr(^ModemManager) => 0,
      qr(^wpa_supplicant) => 0,
      qr(^openvpn) => 0,
      qr(^quagga) => 0,
+    qr(^frr) => 0,
      qr(^tinc) => 0,
      qr(^(open|free|libre|strong)swan) => 0,
  
@@ -120,19 +123,17 @@ $nrconf{override_rc} = {
      qr(^libvirt) => 0,
      qr(^docker) => 0,
  
-    # workaround for broken systemd-journald
-    # (see also Debian Bug#771122 & #771254)
-    qr(^systemd-journald) => 0,
-
-    # more systemd stuff
+    # systemd stuff
      # (see also Debian Bug#784238 & #784437)
      qr(^emergency\.service$) => 0,
      qr(^rescue\.service$) => 0,
  
-    # do not restart oneshot services, see #862840
+    # do not restart oneshot services, see also #862840
      qr(^apt-daily\.service$) => 0,
      qr(^apt-daily-upgrade\.service$) => 0,
      qr(^unattended-upgrades\.service$) => 0,
+    # do not restart oneshot services from systemd-cron, see also #917073
+    qr(^cron-.*\.service$) => 0,
  
      # ignore rc-local.service, see #852864
      qr(^rc-local\.service$) => 0,
@@ -176,6 +177,9 @@ $nrconf{blacklist_mappings} = [
  
      # Java Foreign Function Interface
      qr#^/tmp/jffi#,
+
+    # elasticsearch
+    qr#^/tmp/elasticsearch\.#,
  ];
  
  # Verify mapped files in fileystem:
@@ -190,6 +194,11 @@ $nrconf{skip_mapfiles} = (-d '/proc/sys/kernel/grsecurity' ? -1 : 0);
  # -1: print kernel hints to stderr only
  #$nrconf{kernelhints} = -1;
  
+# Enable/disable CPU microcode update hints:
+#  1: requires the user to acknowledge pending updates
+#  0: disable microcode checks completely
+#$nrconf{ucodehints} = 0;
+
  # Nagios Plugin: configure return code use by nagios
  # as service status[1].
  #
diff --git a/network/if-pre-up.d/wireless-tools b/network/if-pre-up.d/wireless-tools

index 1525c908a513b7002d40b6f6c35e3119568df305..0bd400efe367a46253485da616f4f22227a72e34 100755 (executable)
--- a/network/if-pre-up.d/wireless-tools
+++ b/network/if-pre-up.d/wireless-tools
@@ -138,6 +138,6 @@ apply_settings 2>/dev/null
  
  if [ -n "$FAIL" ]; then
         FAIL=
-       ifconfig "$IFACE" up
+       /sbin/ip link set dev "$IFACE" up
         apply_settings
  fi
diff --git a/network/if-up.d/ntpdate b/network/if-up.d/ntpdate

deleted file mode 100755 (executable)

index 7fdc338..0000000
--- a/network/if-up.d/ntpdate
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-# This is a heuristic:  The idea is that if a static interface is brought
-# up, that is a major event, and we can put in some extra effort to fix
-# the system time.  Feel free to change this, especially if you regularly
-# bring up new network interfaces.
-if [ "$METHOD" = static ]; then
-       OPTS="-b"
-fi
-
-if [ "$METHOD" = loopback ] || [ "$METHOD" = none ]; then
-       exit 0
-fi
-
-# Check whether ntpdate was removed but not purged; it's useless to wait for 
-# it in that case.
-if [ ! -x /usr/sbin/ntpdate-debian ] && [ -d /usr/sbin ]; then
-       exit 0
-fi
-
-(
-
-# This is for the case that /usr will be mounted later.
-if [ -r /lib/udev/hotplug.functions ]; then
-       . /lib/udev/hotplug.functions
-       wait_for_file /usr/sbin/ntpdate-debian
-fi
-
-# Avoid running more than one at a time
-flock -n /run/lock/ntpdate /usr/sbin/ntpdate-debian -s $OPTS 2>/dev/null || :
-
-) &
diff --git a/openfortivpn/config b/openfortivpn/config

index 1e856c025195a4e95283e915bea9cbdf68bc6148..82d19c2256effcb8f48166ec099fb4e5657dc5be 100644 (file)
--- a/openfortivpn/config
+++ b/openfortivpn/config
@@ -1,8 +1,6 @@
-# config file for openfortivpn, see man openfortivpn(1)
-# host = gb-ssl-auth.pixelpark.net
-host = 93.188.110.49
-port = 443
-username = frank.brehm
-password = strasse1
-realm = pp-its
-trusted-cert = 6344e6bd4e30df1a4fbb438eeac5faac56a99b017c0821ebb35ea85e3e017510
+# ### config file for openfortivpn, see man openfortivpn(1) ###
+# 
+# host = vpn.example.org
+# port = 443
+# username = vpnuser
+# password = VPNpassw0rd
diff --git a/openvpn/update-resolv-conf b/openvpn/update-resolv-conf

index fc2f0318279df6c673a59c8358c35945bd702349..61b15d9a3cef229881d66877cdaa26b54e2f1fd5 100755 (executable)
--- a/openvpn/update-resolv-conf
+++ b/openvpn/update-resolv-conf
@@ -15,7 +15,11 @@
  #     foreign_option_3='dhcp-option DOMAIN be.bnc.ch'
  #
  
-[ -x /sbin/resolvconf ] || exit 0
+if [ ! -x /sbin/resolvconf ] ; then
+    logger "[OpenVPN:update-resolve-conf] missing binary /sbin/resolvconf";
+    exit 0;
+fi
+
  [ "$script_type" ] || exit 0
  [ "$dev" ] || exit 0
  
@@ -30,7 +34,8 @@ case "$script_type" in
    up)
         NMSRVRS=""
         SRCHS=""
-       for optionvarname in ${!foreign_option_*} ; do
+       foreign_options=$(printf '%s\n' ${!foreign_option_*} | sort -t _ -k 3 -g)
+       for optionvarname in ${foreign_options} ; do
                 option="${!optionvarname}"
                 echo "$option"
                 split_into_parts $option
diff --git a/pam.d/gdm-fingerprint b/pam.d/gdm-fingerprint

index d5b901a553d207e4864cff6d5fe85981b19fc17c..35fb7d3a58898fdab2810b712b07380e030992c1 100644 (file)
--- a/pam.d/gdm-fingerprint
+++ b/pam.d/gdm-fingerprint
@@ -12,6 +12,9 @@ session required        pam_loginuid.so
  # SELinux needs to intervene at login time to ensure that the process
  # starts in the proper default security context. Only sessions which are
  # intended to run in the user's context should be run after this.
+# pam_selinux.so changes the SELinux context of the used TTY and configures
+# SELinux in order to transition to the user context with the next execve()
+# call.
  session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
  session optional        pam_keyinit.so force revoke
  session required        pam_limits.so
diff --git a/pam.d/gdm-password b/pam.d/gdm-password

index 7ed2b16eee2daa6d298a2c0fb762347bfb33eec3..2a15d02a7aa3b4d3b55d156749883e9e8812893f 100644 (file)
--- a/pam.d/gdm-password
+++ b/pam.d/gdm-password
@@ -12,6 +12,9 @@ session required        pam_loginuid.so
  # SELinux needs to intervene at login time to ensure that the process
  # starts in the proper default security context. Only sessions which are
  # intended to run in the user's context should be run after this.
+# pam_selinux.so changes the SELinux context of the used TTY and configures
+# SELinux in order to transition to the user context with the next execve()
+# call.
  session [success=ok ignore=ignore module_unknown=ignore default=bad]        pam_selinux.so open
  session optional        pam_keyinit.so force revoke
  session required        pam_limits.so
diff --git a/passwd b/passwd

index 108ee74f51c37e6a9ef96778ea3ef1d006c7df5d..4b827271da3ec17214685f27860e27e90a91d022 100644 (file)
--- a/passwd
+++ b/passwd
@@ -62,3 +62,4 @@ ulog:x:130:144::/var/log/ulog:/bin/false
  vde2-net:x:131:145::/var/run/vde2:/usr/sbin/nologin
  smbguest:x:1125:1000:Samba guest account:/dev/null:/dev/null
  gast:x:1126:1126:Samba User Account:/dev/null:/dev/null
+tcpdump:x:132:147::/nonexistent:/usr/sbin/nologin
diff --git a/passwd- b/passwd-

index 316e722d4fe5a6f86004caf6ab7f0d3ce94c6d37..4b827271da3ec17214685f27860e27e90a91d022 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -61,3 +61,5 @@ statd:x:129:65534::/var/lib/nfs:/usr/sbin/nologin
  ulog:x:130:144::/var/log/ulog:/bin/false
  vde2-net:x:131:145::/var/run/vde2:/usr/sbin/nologin
  smbguest:x:1125:1000:Samba guest account:/dev/null:/dev/null
+gast:x:1126:1126:Samba User Account:/dev/null:/dev/null
+tcpdump:x:132:147::/nonexistent:/usr/sbin/nologin
diff --git a/perl/XML/SAX/ParserDetails.ini b/perl/XML/SAX/ParserDetails.ini

index ddad96801870e35ceb5326cd8f013bb741fe4a2c..254603f780549c4fd137eda163da0c61c5516e98 100644 (file)
--- a/perl/XML/SAX/ParserDetails.ini
+++ b/perl/XML/SAX/ParserDetails.ini
@@ -3,8 +3,8 @@ http://xml.org/sax/features/namespaces = 1
  
  
  [XML::SAX::Expat]
-http://xml.org/sax/features/external-parameter-entities = 1
  http://xml.org/sax/features/namespaces = 1
+http://xml.org/sax/features/external-parameter-entities = 1
  http://xml.org/sax/features/external-general-entities = 1
  
  
diff --git a/ppp/ip-up.d/0000usepeerdns b/ppp/ip-up.d/0000usepeerdns

index 45fbc2e0c75d652f8a422890f88f1dc413cf4021..fa3c913c1b0875414e2e26458fa86303bf33277f 100755 (executable)
--- a/ppp/ip-up.d/0000usepeerdns
+++ b/ppp/ip-up.d/0000usepeerdns
@@ -6,6 +6,13 @@
  # exit if the resolvconf package is installed
  [ -x /sbin/resolvconf ] && exit 0
  
+case "$6" in
+  nm-pptp-service-*|nm-l2tp-service-*|/org/freedesktop/NetworkManager/PPP/*)
+        # NetworkManager handles it
+        exit 0
+        ;;
+esac
+
  # create the file if it does not exist
  if [ ! -e /etc/resolv.conf ]; then
    : > /etc/resolv.conf
diff --git a/profile.d/bash_completion.sh b/profile.d/bash_completion.sh

index 902a7f744eb87bd1e0fe03a67b620644e94df715..031ba94617b398e2ef93a417ae60b3f222d242f6 100644 (file)
--- a/profile.d/bash_completion.sh
+++ b/profile.d/bash_completion.sh
@@ -1,9 +1,10 @@
+# shellcheck shell=sh disable=SC1091,SC2039,SC2166
  # Check for interactive bash and that we haven't already been sourced.
-if [ -n "${BASH_VERSION-}" -a -n "${PS1-}" -a -z "${BASH_COMPLETION_VERSINFO-}" ]; then
+if [ "x${BASH_VERSION-}" != x -a "x${PS1-}" != x -a "x${BASH_COMPLETION_VERSINFO-}" = x ]; then
  
      # 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
+    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
diff --git a/profile.d/input-method-config.sh b/profile.d/input-method-config.sh

deleted file mode 100644 (file)

index dbaf4b4..0000000
--- a/profile.d/input-method-config.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-# /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/rc0.d/K01ebtables b/rc0.d/K01ebtables

deleted file mode 120000 (symlink)

index 565b3c4..0000000
--- a/rc0.d/K01ebtables
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ebtables
-\ No newline at end of file
diff --git a/rc1.d/K01ebtables b/rc1.d/K01ebtables

deleted file mode 120000 (symlink)

index 565b3c4..0000000
--- a/rc1.d/K01ebtables
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ebtables
-\ No newline at end of file
diff --git a/rc2.d/K01speech-dispatcher b/rc2.d/K01speech-dispatcher

new file mode 120000 (symlink)

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

deleted file mode 120000 (symlink)

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

new file mode 120000 (symlink)

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

deleted file mode 120000 (symlink)

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

new file mode 120000 (symlink)

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

deleted file mode 120000 (symlink)

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

new file mode 120000 (symlink)

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

deleted file mode 120000 (symlink)

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

deleted file mode 120000 (symlink)

index 565b3c4..0000000
--- a/rc6.d/K01ebtables
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ebtables
-\ No newline at end of file
diff --git a/rcS.d/S01ebtables b/rcS.d/S01ebtables

deleted file mode 120000 (symlink)

index 565b3c4..0000000
--- a/rcS.d/S01ebtables
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/ebtables
-\ No newline at end of file
diff --git a/rmt b/rmt

deleted file mode 100755 (executable)

index 4fadd09c9a44aba3051f35ad2b92b93dfeba579a..0000000000000000000000000000000000000000
--- a/rmt
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# This is not a mistake.  This shell script (/etc/rmt) has been provided
-# for compatibility with other Unix-like systems, some of which have
-# utilities that expect to find (and execute) rmt in the /etc directory
-# on remote systems.
-#
-exec /usr/sbin/rmt
diff --git a/rmt b/rmt

new file mode 120000 (symlink)

index 0000000000000000000000000000000000000000..34d899416b6e449c673f52f2887358394325e586
--- /dev/null
+++ b/rmt
@@ -0,0 +1 @@
+/usr/sbin/rmt
+\ No newline at end of file
diff --git a/rsyslog.conf b/rsyslog.conf

index fb526ba8f21bc7dc0a0176608a880c967f9eb7b8..e2cca72c148541538ecfbe33079c0bcccfd2bfcb 100644 (file)
--- a/rsyslog.conf
+++ b/rsyslog.conf
@@ -1,9 +1,9 @@
-#  /etc/rsyslog.conf   Configuration file for rsyslog.
+# /etc/rsyslog.conf configuration file for rsyslog
  #
-#                      For more information see
-#                      /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
+# For more information install rsyslog-doc and see
+# /usr/share/doc/rsyslog-doc/html/configuration/index.html
  #
-#  Default logging rules can be found in /etc/rsyslog.d/50-default.conf
+# Default logging rules can be found in /etc/rsyslog.d/50-default.conf
  
  
  #################
@@ -12,7 +12,6 @@
  
  module(load="imuxsock") # provides support for local system logging
  #module(load="immark")  # provides --MARK-- message capability
-module(load="immark" Interval="3600")
  
  # provides UDP syslog reception
  #module(load="imudp")
@@ -29,18 +28,11 @@ module(load="imklog" permitnonkernelfacility="on")
  #### GLOBAL DIRECTIVES ####
  ###########################
  
-module(load="impstats"
-       interval="43200"
-       severity="7"
-       log.syslog="off"
-       /* need to turn log stream logging off! */
-       log.file="/var/log/syslog.d/stats.log")
-
  #
  # Use traditional timestamp format.
  # To enable high precision timestamps, comment out the following line.
  #
-#$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
  
  # Filter duplicated messages
  $RepeatedMsgReduction on
@@ -50,11 +42,11 @@ $RepeatedMsgReduction on
  #
  $FileOwner syslog
  $FileGroup adm
-$FileCreateMode 0644
+$FileCreateMode 0640
  $DirCreateMode 0755
  $Umask 0022
-#$PrivDropToUser syslog
-#$PrivDropToGroup syslog
+$PrivDropToUser syslog
+$PrivDropToGroup syslog
  
  #
  # Where to place spool and state files
diff --git a/security/access.conf b/security/access.conf

index 74c5fbe84b8e3ee8a9790809d821a447e2ac4684..47b6b84c1e3609fd3c6e9f7d67a891859bd8da5a 100644 (file)
--- a/security/access.conf
+++ b/security/access.conf
@@ -18,7 +18,7 @@
  # pam_access with X applications that provide PAM_TTY values that are
  # the display variable like "host:0".]
  #
-#      permission : users : origins
+#      permission:users:origins
  #
  # The first field should be a "+" (access granted) or "-" (access denied)
  # character.
@@ -79,44 +79,44 @@
  ##############################################################################
  #
  # User "root" should be allowed to get access via cron .. tty5 tty6.
-#+ : root : cron crond :0 tty1 tty2 tty3 tty4 tty5 tty6
+#+:root:cron crond :0 tty1 tty2 tty3 tty4 tty5 tty6
  #
  # User "root" should be allowed to get access from hosts with ip addresses.
-#+ : root : 192.168.200.1 192.168.200.4 192.168.200.9
-#+ : root : 127.0.0.1
+#+:root:192.168.200.1 192.168.200.4 192.168.200.9
+#+:root:127.0.0.1
  #
  # User "root" should get access from network 192.168.201.
  # This term will be evaluated by string matching.
  # comment: It might be better to use network/netmask instead.
  #          The same is 192.168.201.0/24 or 192.168.201.0/255.255.255.0
-#+ : root : 192.168.201.
+#+:root:192.168.201.
  #
  # User "root" should be able to have access from domain.
  # Uses string matching also.
-#+ : root : .foo.bar.org
+#+:root:.foo.bar.org
  #
  # User "root" should be denied to get access from all other sources.
-#- : root : ALL
+#-:root:ALL
  #
  # User "foo" and members of netgroup "nis_group" should be
  # allowed to get access from all sources.
  # This will only work if netgroup service is available.
-#+ : @nis_group foo : ALL
+#+:@nis_group foo:ALL
  #
  # User "john" should get access from ipv4 net/mask
-#+ : john : 127.0.0.0/24
+#+:john:127.0.0.0/24
  #
  # User "john" should get access from ipv4 as ipv6 net/mask
-#+ : john : ::ffff:127.0.0.0/127
+#+:john:::ffff:127.0.0.0/127
  #
  # User "john" should get access from ipv6 host address
-#+ : john : 2001:4ca0:0:101::1
+#+:john:2001:4ca0:0:101::1
  #
  # User "john" should get access from ipv6 host address (same as above)
-#+ : john : 2001:4ca0:0:101:0:0:0:1
+#+:john:2001:4ca0:0:101:0:0:0:1
  #
  # User "john" should get access from ipv6 net/mask
-#+ : john : 2001:4ca0:0:101::/64
+#+:john:2001:4ca0:0:101::/64
  #
  # All other users should be denied to get access from all sources.
-#- : ALL : ALL
+#-:ALL:ALL
diff --git a/security/limits.conf b/security/limits.conf

index 7ced05303d8393ed1019c27c4b845b2729a43ef1..1aec6525a188f827eeabdec4c4f7866661aee668 100644 (file)
--- a/security/limits.conf
+++ b/security/limits.conf
@@ -24,7 +24,7 @@
  #        - data - max data size (KB)
  #        - fsize - maximum filesize (KB)
  #        - memlock - max locked-in-memory address space (KB)
-#        - nofile - max number of open files
+#        - nofile - max number of open file descriptors
  #        - rss - max resident set size (KB)
  #        - stack - max stack size (KB)
  #        - cpu - max CPU time (MIN)
diff --git a/security/pwquality.conf b/security/pwquality.conf

index 550036d3027f89e7ce8557f9e7d06f7ac9c3f299..1b05cb49c5d57bf53192a70458305655e28bf335 100644 (file)
--- a/security/pwquality.conf
+++ b/security/pwquality.conf
@@ -61,3 +61,15 @@
  #
  # Path to the cracklib dictionaries. Default is to use the cracklib default.
  # dictpath =
+#
+# Prompt user at most N times before returning with error. The default is 1.
+# retry = 3
+#
+# Enforces pwquality checks on the root user password.
+# Enabled if the option is present.
+# enforce_for_root
+#
+# Skip testing the password quality for users that are not present in the
+# /etc/passwd file.
+# Enabled if the option is present.
+# local_users_only
diff --git a/services b/services

index e3202ec12a493266e08d784dd197f64fe01ebffe..1c0643602896599085b0237fc5e9dbe6861a7b7e 100644 (file)
--- a/services
+++ b/services
@@ -4,8 +4,8 @@
  # port number for both TCP and UDP; hence, officially ports have two entries
  # even if the protocol doesn't support UDP operations.
  #
-# Updated from http://www.iana.org/assignments/port-numbers and other
-# sources like http://www.freebsd.org/cgi/cvsweb.cgi/src/etc/services .
+# Updated from https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml .
+#
  # New ports will be added on request if they have been officially assigned
  # by IANA and used in the real-world or are needed by a debian package.
  # If you need a huge list of used numbers please install the nmap package.
@@ -20,8 +20,6 @@ daytime               13/tcp
  daytime                13/udp
  netstat                15/tcp
  qotd           17/tcp          quote
-msp            18/tcp                          # message send protocol
-msp            18/udp
  chargen                19/tcp          ttytst source
  chargen                19/udp          ttytst source
  ftp-data       20/tcp
@@ -32,49 +30,28 @@ telnet              23/tcp
  smtp           25/tcp          mail
  time           37/tcp          timserver
  time           37/udp          timserver
-rlp            39/udp          resource        # resource location
-nameserver     42/tcp          name            # IEN 116
  whois          43/tcp          nicname
  tacacs         49/tcp                          # Login Host Protocol (TACACS)
  tacacs         49/udp
-re-mail-ck     50/tcp                          # Remote Mail Checking Protocol
-re-mail-ck     50/udp
  domain         53/tcp                          # Domain Name Server
  domain         53/udp
-tacacs-ds      65/tcp                          # TACACS-Database Service
-tacacs-ds      65/udp
-bootps         67/tcp                          # BOOTP server
  bootps         67/udp
-bootpc         68/tcp                          # BOOTP client
  bootpc         68/udp
  tftp           69/udp
  gopher         70/tcp                          # Internet Gopher
  finger         79/tcp
  http           80/tcp          www             # WorldWideWeb HTTP
-link           87/tcp          ttylink
  kerberos       88/tcp          kerberos5 krb5 kerberos-sec     # Kerberos v5
  kerberos       88/udp          kerberos5 krb5 kerberos-sec     # Kerberos v5
-supdup         95/tcp
-hostnames      101/tcp         hostname        # usually from sri-nic
  iso-tsap       102/tcp         tsap            # part of ISODE
  acr-nema       104/tcp         dicom           # Digital Imag. & Comm. 300
-acr-nema       104/udp         dicom
-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
  pop3           110/tcp         pop-3           # POP version 3
  sunrpc         111/tcp         portmapper      # RPC 4.0 portmapper
  sunrpc         111/udp         portmapper
  auth           113/tcp         authentication tap ident
-sftp           115/tcp
  nntp           119/tcp         readnews untp   # USENET News Transfer Protocol
-ntp            123/tcp
  ntp            123/udp                         # Network Time Protocol
-pwdgen         129/tcp                         # PWDGEN service
-pwdgen         129/udp
-loc-srv                135/tcp         epmap           # Location Service
-loc-srv                135/udp         epmap
+epmap          135/tcp         loc-srv         # DCE endpoint resolution
  netbios-ns     137/tcp                         # NETBIOS Name Service
  netbios-ns     137/udp
  netbios-dgm    138/tcp                         # NETBIOS Datagram Service
@@ -91,77 +68,40 @@ cmip-man    163/udp
  cmip-agent     164/tcp
  cmip-agent     164/udp
  mailq          174/tcp                 # Mailer transport queue for Zmailer
-mailq          174/udp
-xdmcp          177/tcp                         # X Display Mgr. Control Proto
-xdmcp          177/udp
-nextstep       178/tcp         NeXTStep NextStep       # NeXTStep window
-nextstep       178/udp         NeXTStep NextStep       #  server
+xdmcp          177/udp                 # X Display Manager Control Protocol
  bgp            179/tcp                         # Border Gateway Protocol
-irc            194/tcp                         # Internet Relay Chat
-irc            194/udp
  smux           199/tcp                         # SNMP Unix Multiplexer
-smux           199/udp
-at-rtmp                201/tcp                         # AppleTalk routing
-at-rtmp                201/udp
-at-nbp         202/tcp                         # AppleTalk name binding
-at-nbp         202/udp
-at-echo                204/tcp                         # AppleTalk echo
-at-echo                204/udp
-at-zis         206/tcp                         # AppleTalk zone information
-at-zis         206/udp
  qmtp           209/tcp                         # Quick Mail Transfer Protocol
-qmtp           209/udp
  z3950          210/tcp         wais            # NISO Z39.50 database
-z3950          210/udp         wais
-ipx            213/tcp                         # IPX
-ipx            213/udp
+ipx            213/udp                         # IPX [RFC1234]
+ptp-event      319/udp
+ptp-general    320/udp
  pawserv                345/tcp                         # Perf Analysis Workbench
-pawserv                345/udp
  zserv          346/tcp                         # Zebra server
-zserv          346/udp
-fatserv                347/tcp                         # Fatmen Server
-fatserv                347/udp
  rpc2portmap    369/tcp
  rpc2portmap    369/udp                         # Coda portmapper
  codaauth2      370/tcp
  codaauth2      370/udp                         # Coda authentication server
-clearcase      371/tcp         Clearcase
  clearcase      371/udp         Clearcase
-ulistserv      372/tcp                         # UNIX Listserv
-ulistserv      372/udp
  ldap           389/tcp                 # Lightweight Directory Access Protocol
  ldap           389/udp
-imsp           406/tcp                 # Interactive Mail Support Protocol
-imsp           406/udp
  svrloc         427/tcp                         # Server Location
  svrloc         427/udp
  https          443/tcp                         # http protocol over TLS/SSL
  snpp           444/tcp                         # Simple Network Paging Protocol
-snpp           444/udp
  microsoft-ds   445/tcp                         # Microsoft Naked CIFS
  microsoft-ds   445/udp
  kpasswd                464/tcp
  kpasswd                464/udp
-urd            465/tcp         ssmtp smtps  # URL Rendesvous Directory for SSM
+submissions    465/tcp         ssmtp smtps urd # Submission over TLS [RFC8314]
  saft           487/tcp                 # Simple Asynchronous File Transfer
-saft           487/udp
-isakmp         500/tcp                 # IPsec - Internet Security Association
-isakmp         500/udp                 #  and Key Management Protocol
+isakmp         500/udp                         # IPSEC key management
  rtsp           554/tcp                 # Real Time Stream Control Protocol
  rtsp           554/udp
  nqs            607/tcp                         # Network Queuing system
-nqs            607/udp
-npmp-local     610/tcp         dqs313_qmaster          # npmp-local / DQS
-npmp-local     610/udp         dqs313_qmaster
-npmp-gui       611/tcp         dqs313_execd            # npmp-gui / DQS
-npmp-gui       611/udp         dqs313_execd
-hmmp-ind       612/tcp         dqs313_intercell        # HMMP Indication / DQS
-hmmp-ind       612/udp         dqs313_intercell
  asf-rmcp       623/udp         # ASF Remote Management and Control Protocol
  qmqp           628/tcp
-qmqp           628/udp
  ipp            631/tcp                         # Internet Printing Protocol
-ipp            631/udp
  #
  # UNIX specific services
  #
@@ -169,32 +109,20 @@ exec              512/tcp
  biff           512/udp         comsat
  login          513/tcp
  who            513/udp         whod
-shell          514/tcp         cmd             # no passwords used
+shell          514/tcp         cmd syslog      # no passwords used
  syslog         514/udp
  printer                515/tcp         spooler         # line printer spooler
  talk           517/udp
  ntalk          518/udp
  route          520/udp         router routed   # RIP
-timed          525/udp         timeserver
-tempo          526/tcp         newdate
-courier                530/tcp         rpc
-conference     531/tcp         chat
-netnews                532/tcp         readnews
-netwall                533/udp                         # for emergency broadcasts
  gdomap         538/tcp                         # GNUstep distributed objects
  gdomap         538/udp
  uucp           540/tcp         uucpd           # uucp daemon
  klogin         543/tcp                         # Kerberized `rlogin' (v5)
  kshell         544/tcp         krcmd           # Kerberized `rsh' (v5)
-dhcpv6-client  546/tcp
  dhcpv6-client  546/udp
-dhcpv6-server  547/tcp
  dhcpv6-server  547/udp
  afpovertcp     548/tcp                         # AFP over TCP
-afpovertcp     548/udp
-idfp           549/tcp
-idfp           549/udp
-remotefs       556/tcp         rfs_server rfs  # Brunhoff remote filesystem
  nntps          563/tcp         snntp           # NNTP over SSL
  submission     587/tcp                         # Submission [RFC4409]
  ldaps          636/tcp                         # LDAP over SSL
@@ -202,11 +130,10 @@ ldaps             636/udp
  tinc           655/tcp                         # tinc control port
  tinc           655/udp
  silc           706/tcp
-silc           706/udp
  kerberos-adm   749/tcp                         # Kerberos `kadmin' (v5)
  #
-webster                765/tcp                         # Network dictionary
-webster                765/udp
+domain-s       853/tcp                         # DNS over TLS [RFC7858]
+domain-s       853/udp                         # DNS over DTLS [RFC8094]
  rsync          873/tcp
  ftps-data      989/tcp                         # FTP over SSL (data)
  ftps           990/tcp
@@ -229,50 +156,29 @@ pop3s             995/tcp                         # POP-3 over SSL
  #> community.
  #
  socks          1080/tcp                        # socks proxy server
-socks          1080/udp
  proofd         1093/tcp
-proofd         1093/udp
  rootd          1094/tcp
-rootd          1094/udp
  openvpn                1194/tcp
  openvpn                1194/udp
  rmiregistry    1099/tcp                        # Java RMI Registry
-rmiregistry    1099/udp
-kazaa          1214/tcp
-kazaa          1214/udp
-nessus         1241/tcp                        # Nessus vulnerability
-nessus         1241/udp                        #  assessment scanner
  lotusnote      1352/tcp        lotusnotes      # Lotus Note
-lotusnote      1352/udp        lotusnotes
  ms-sql-s       1433/tcp                        # Microsoft SQL Server
  ms-sql-s       1433/udp
  ms-sql-m       1434/tcp                        # Microsoft SQL Monitor
  ms-sql-m       1434/udp
  ingreslock     1524/tcp
-ingreslock     1524/udp
  datametrics    1645/tcp        old-radius
  datametrics    1645/udp        old-radius
  sa-msg-port    1646/tcp        old-radacct
  sa-msg-port    1646/udp        old-radacct
  kermit         1649/tcp
-kermit         1649/udp
  groupwise      1677/tcp
-groupwise      1677/udp
-l2f            1701/tcp        l2tp
  l2f            1701/udp        l2tp
  radius         1812/tcp
  radius         1812/udp
  radius-acct    1813/tcp        radacct         # Radius Accounting
  radius-acct    1813/udp        radacct
-msnp           1863/tcp                        # MSN Messenger
-msnp           1863/udp
-unix-status    1957/tcp                        # remstats unix-status server
-log-server     1958/tcp                        # remstats log server
-remoteping     1959/tcp                        # remstats remoteping server
  cisco-sccp     2000/tcp                        # Cisco SCCP
-cisco-sccp     2000/udp
-search         2010/tcp        ndtp
-pipe-server    2010/tcp        pipe_server
  nfs            2049/tcp                        # Network File System
  nfs            2049/udp                        # Network File System
  gnunet         2086/tcp
@@ -280,11 +186,8 @@ gnunet             2086/udp
  rtcm-sc104     2101/tcp                        # RTCM SC-104 IANA 1/29/99
  rtcm-sc104     2101/udp
  gsigatekeeper  2119/tcp
-gsigatekeeper  2119/udp
  gris           2135/tcp                # Grid Resource Information Server
-gris           2135/udp
  cvspserver     2401/tcp                        # CVS client/server operations
-cvspserver     2401/udp
  venus          2430/tcp                        # codacon port
  venus          2430/udp                        # Venus callback/wbc interface
  venus-se       2431/tcp                        # tcp side effects
@@ -296,22 +199,17 @@ codasrv-se        2433/udp                        # udp sftp side effect
  mon            2583/tcp                        # MON traps
  mon            2583/udp
  dict           2628/tcp                        # Dictionary server
-dict           2628/udp
  f5-globalsite  2792/tcp
-f5-globalsite  2792/udp
  gsiftp         2811/tcp
-gsiftp         2811/udp
  gpsd           2947/tcp
-gpsd           2947/udp
  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
+ms-wbt-server  3389/tcp
  nut            3493/tcp                        # Network UPS Tools
  nut            3493/udp
  distcc         3632/tcp                        # distributed compiler
@@ -338,60 +236,35 @@ mtn               4691/tcp                        # monotone Netsync Protocol
  mtn            4691/udp
  radmin-port    4899/tcp                        # RAdmin Port
  radmin-port    4899/udp
-rfe            5002/udp                        # Radio Free Ethernet
-rfe            5002/tcp
-mmcc           5050/tcp        # multimedia conference control tool (Yahoo IM)
-mmcc           5050/udp
  sip            5060/tcp                        # Session Initiation Protocol
  sip            5060/udp
  sip-tls                5061/tcp
  sip-tls                5061/udp
-aol            5190/tcp                        # AIM
-aol            5190/udp
  xmpp-client    5222/tcp        jabber-client   # Jabber Client Connection
-xmpp-client    5222/udp        jabber-client
  xmpp-server    5269/tcp        jabber-server   # Jabber Server Connection
-xmpp-server    5269/udp        jabber-server
  cfengine       5308/tcp
-cfengine       5308/udp
-mdns           5353/tcp                        # Multicast DNS
-mdns           5353/udp
+mdns           5353/udp                        # Multicast DNS
  postgresql     5432/tcp        postgres        # PostgreSQL Database
-postgresql     5432/udp        postgres
  freeciv                5556/tcp        rptp            # Freeciv gameplay
-freeciv                5556/udp
  amqps          5671/tcp                        # AMQP protocol over TLS/SSL
  amqp           5672/tcp
  amqp           5672/udp
  amqp           5672/sctp
-ggz            5688/tcp                        # GGZ Gaming Zone
-ggz            5688/udp
  x11            6000/tcp        x11-0           # X Window System
-x11            6000/udp        x11-0
  x11-1          6001/tcp
-x11-1          6001/udp
  x11-2          6002/tcp
-x11-2          6002/udp
  x11-3          6003/tcp
-x11-3          6003/udp
  x11-4          6004/tcp
-x11-4          6004/udp
  x11-5          6005/tcp
-x11-5          6005/udp
  x11-6          6006/tcp
-x11-6          6006/udp
  x11-7          6007/tcp
-x11-7          6007/udp
  gnutella-svc   6346/tcp                        # gnutella
  gnutella-svc   6346/udp
  gnutella-rtr   6347/tcp                        # gnutella
  gnutella-rtr   6347/udp
  sge-qmaster    6444/tcp        sge_qmaster     # Grid Engine Qmaster Service
-sge-qmaster    6444/udp        sge_qmaster
  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
@@ -415,45 +288,22 @@ afs3-update       7008/udp
  afs3-rmtsys    7009/tcp                        # remote cache manager service
  afs3-rmtsys    7009/udp
  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
-bacula-fd      9102/udp
  bacula-sd      9103/tcp                        # Bacula Storage Daemon
-bacula-sd      9103/udp
  xmms2          9667/tcp        # Cross-platform Music Multiplexing System
-xmms2          9667/udp
  nbd            10809/tcp                       # Linux Network Block Device
  zabbix-agent   10050/tcp                       # Zabbix Agent
-zabbix-agent   10050/udp
  zabbix-trapper 10051/tcp                       # Zabbix Trapper
-zabbix-trapper 10051/udp
  amanda         10080/tcp                       # amanda backup services
-amanda         10080/udp
  dicom          11112/tcp
  hkp            11371/tcp                       # OpenPGP HTTP Keyserver
-hkp            11371/udp
-bprd           13720/tcp                       # VERITAS NetBackup
-bprd           13720/udp
-bpdbm          13721/tcp                       # VERITAS NetBackup
-bpdbm          13721/udp
-bpjava-msvc    13722/tcp                       # BP Java MSVC Protocol
-bpjava-msvc    13722/udp
-vnetd          13724/tcp                       # Veritas Network Utility
-vnetd          13724/udp
-bpcd           13782/tcp                       # VERITAS NetBackup
-bpcd           13782/udp
-vopied         13783/tcp                       # VERITAS NetBackup
-vopied         13783/udp
  db-lsp         17500/tcp                       # Dropbox LanSync Protocol
  dcap           22125/tcp                       # dCache Access Protocol
  gsidcap                22128/tcp                       # GSI dCache Access Protocol
  wnn6           22273/tcp                       # wnn6
-wnn6           22273/udp
  
  #
  # Datagram Delivery Protocol services
@@ -468,58 +318,36 @@ zip               6/ddp                   # Zone Information Protocol
  #=========================================================================
  
  # Kerberos (Project Athena/MIT) services
-# Note that these are for Kerberos v4, and are unofficial.  Sites running
-# v4 should uncomment these and comment out the v5 entries above.
-#
  kerberos4      750/udp         kerberos-iv kdc # Kerberos (server)
  kerberos4      750/tcp         kerberos-iv kdc
  kerberos-master        751/udp         kerberos_master # Kerberos authentication
  kerberos-master        751/tcp
  passwd-server  752/udp         passwd_server   # Kerberos passwd server
  krb-prop       754/tcp         krb_prop krb5_prop hprop # Kerberos slave propagation
-krbupdate      760/tcp         kreg            # Kerberos registration
-swat           901/tcp                         # swat
-kpop           1109/tcp                        # Pop with Kerberos
-knetd          2053/tcp                        # Kerberos de-multiplexor
  zephyr-srv     2102/udp                        # Zephyr server
  zephyr-clt     2103/udp                        # Zephyr serv-hm connection
  zephyr-hm      2104/udp                        # Zephyr hostmanager
-eklogin                2105/tcp                        # Kerberos encrypted rlogin
-# Hmmm. Are we using Kv4 or Kv5 now? Worrying.
-# The following is probably Kerberos v5  --- ajt@debian.org (11/02/2000)
-kx             2111/tcp                        # X over Kerberos
  iprop          2121/tcp                        # incremental propagation
-#
-# Unofficial but necessary (for NetBSD) services
-#
-supfilesrv     871/tcp                         # SUP server
-supfiledbg     1127/tcp                        # SUP debugging
+supfilesrv     871/tcp                 # Software Upgrade Protocol server
+supfiledbg     1127/tcp                # Software Upgrade Protocol debugging
  
  #
  # Services added for the Debian GNU/Linux distribution
  #
-linuxconf      98/tcp                          # LinuxConf
  poppassd       106/tcp                         # Eudora
  poppassd       106/udp
  moira-db       775/tcp         moira_db        # Moira database
  moira-update   777/tcp         moira_update    # Moira update protocol
  moira-ureg     779/udp         moira_ureg      # Moira user registration
  spamd          783/tcp                         # spamassassin daemon
-omirr          808/tcp         omirrd          # online mirror
-omirr          808/udp         omirrd
-customs                1001/tcp                        # pmake customs server
-customs                1001/udp
  skkserv                1178/tcp                        # skk jisho server port
  predict                1210/udp                        # predict -- satellite tracking
  rmtcfg         1236/tcp                        # Gracilis Packeten remote config server
-wipld          1300/tcp                        # Wipl network monitor
  xtel           1313/tcp                        # french minitel
  xtelw          1314/tcp                        # french minitel
  support                1529/tcp                        # GNATS
  cfinger                2003/tcp                        # GNU Finger
  frox           2121/tcp                        # frox: caching ftp proxy
-ninstall       2150/tcp                        # ninstall service
-ninstall       2150/udp
  zebrasrv       2600/tcp                        # zebra service
  zebra          2601/tcp                        # zebra vty
  ripd           2602/tcp                        # ripd vty (zebra)
@@ -533,7 +361,6 @@ afbackup    2988/tcp                        # Afbackup system
  afbackup       2988/udp
  afmbackup      2989/tcp                        # Afmbackup system
  afmbackup      2989/udp
-xtell          4224/tcp                        # xtell server
  fax            4557/tcp                        # FAX transmission service (old)
  hylafax                4559/tcp                        # HylaFAX client-server protocol (new)
  distmp3                4600/tcp                        # distmp3host daemon
@@ -565,7 +392,6 @@ git         9418/tcp                        # Git Version Control System
  zope           9673/tcp                        # zope server
  webmin         10000/tcp
  kamanda                10081/tcp                       # amanda backup services (Kerberos)
-kamanda                10081/udp
  amandaidx      10082/tcp                       # amanda backup services
  amidxtape      10083/tcp                       # amanda backup services
  smsqp          11201/tcp                       # Alamin SMS gateway
diff --git a/shadow b/shadow

index e237644795caba7cb279024e199d87e8c3bb82a8..9601193a3557917b599de2a4fe379c33c8accdc9 100644 (file)
--- a/shadow
+++ b/shadow
@@ -62,3 +62,4 @@ ulog:*:18399:0:99999:7:::
  vde2-net:*:18399:0:99999:7:::
  smbguest:!:18434:0:99999:7:::
  gast:!:18434:0:99999:7:::
+tcpdump:*:18464:0:99999:7:::
diff --git a/shadow- b/shadow-

index e8058f51a5a3221270a6bbe89e90da5b05ec6c77..9601193a3557917b599de2a4fe379c33c8accdc9 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -61,3 +61,5 @@ statd:*:18393:0:99999:7:::
  ulog:*:18399:0:99999:7:::
  vde2-net:*:18399:0:99999:7:::
  smbguest:!:18434:0:99999:7:::
+gast:!:18434:0:99999:7:::
+tcpdump:*:18464:0:99999:7:::
diff --git a/snmp-mibs-downloader/cisco.conf b/snmp-mibs-downloader/cisco.conf

new file mode 100644 (file)

index 0000000..1f7bbce
--- /dev/null
+++ b/snmp-mibs-downloader/cisco.conf
@@ -0,0 +1,10 @@
+# Configuarions for Cisco v2 MIBs download from cisco.com
+#
+
+HOST=ftp://ftp.cisco.com
+ARCHIVE=v2.tar.gz
+ARCHTYPE=tgz
+ARCHDIR=auto/mibs/v2
+DIR=pub/mibs/v2/
+CONF=ciscolist
+DEST=cisco
diff --git a/snmp-mibs-downloader/ciscolist b/snmp-mibs-downloader/ciscolist

new file mode 100644 (file)

index 0000000..160f317
--- /dev/null
+++ b/snmp-mibs-downloader/ciscolist
@@ -0,0 +1,1431 @@
+ACCOUNTING-CONTROL-MIB.my              ACCOUNTING-CONTROL-MIB
+ACTONA-ACTASTOR-MIB.my                 ACTONA-ACTASTOR-MIB
+ADMIN-AUTH-STATS-MIB.my                        ADMIN-AUTH-STATS-MIB
+ADSL-DMT-LINE-MIB.my                   ADSL-DMT-LINE-MIB
+ADSL-LINE-MIB.my                       ADSL-LINE-MIB
+ADSL-TC-MIB.my                         ADSL-TC-MIB
+ADSL2-LINE-MIB.my                      ADSL2-LINE-MIB
+ADSL2-LINE-TC-MIB.my                   ADSL2-LINE-TC-MIB
+AIRESPACE-REF-MIB.my                   AIRESPACE-REF-MIB
+AIRESPACE-SWITCHING-MIB.my             AIRESPACE-SWITCHING-MIB
+AIRESPACE-WIRELESS-MIB.my              AIRESPACE-WIRELESS-MIB
+ALTIGA-ADDRESS-STATS-MIB.my            ALTIGA-ADDRESS-STATS-MIB
+ALTIGA-BMGT-STATS-MIB.my               ALTIGA-BMGT-STATS-MIB
+ALTIGA-CAP.my                          ALTIGA-CAP
+ALTIGA-CERT-STATS-MIB.my               ALTIGA-CERT-STATS-MIB
+ALTIGA-DHCP-SERVER-STATS-MIB.my                ALTIGA-DHCP-SERVER-STATS-MIB
+ALTIGA-DHCP-STATS-MIB.my               ALTIGA-DHCP-STATS-MIB
+ALTIGA-DNS-STATS-MIB.my                        ALTIGA-DNS-STATS-MIB
+ALTIGA-EVENT-STATS-MIB.my              ALTIGA-EVENT-STATS-MIB
+ALTIGA-FILTER-STATS-MIB.my             ALTIGA-FILTER-STATS-MIB
+ALTIGA-FTP-STATS-MIB.my                        ALTIGA-FTP-STATS-MIB
+ALTIGA-GENERAL-STATS-MIB.my            ALTIGA-GENERAL-STATS-MIB
+ALTIGA-GLOBAL-REG.my                   ALTIGA-GLOBAL-REG
+ALTIGA-HARDWARE-STATS-MIB.my           ALTIGA-HARDWARE-STATS-MIB
+ALTIGA-HTTP-STATS-MIB.my               ALTIGA-HTTP-STATS-MIB
+ALTIGA-IP-STATS-MIB.my                 ALTIGA-IP-STATS-MIB
+ALTIGA-L2TP-STATS-MIB.my               ALTIGA-L2TP-STATS-MIB
+ALTIGA-LBSSF-STATS-MIB.my              ALTIGA-LBSSF-STATS-MIB
+ALTIGA-MIB.my                          ALTIGA-MIB
+ALTIGA-MULTILINK-STATS-MIB.my          ALTIGA-MULTILINK-STATS-MIB
+ALTIGA-NAT-STATS-MIB.my                        ALTIGA-NAT-STATS-MIB
+ALTIGA-PPP-STATS-MIB.my                        ALTIGA-PPP-STATS-MIB
+ALTIGA-PPPOE-STATS-MIB.my              ALTIGA-PPPOE-STATS-MIB
+ALTIGA-PPTP-STATS-MIB.my               ALTIGA-PPTP-STATS-MIB
+ALTIGA-SDI-ACE-STATS-MIB.my            ALTIGA-SDI-ACE-STATS-MIB
+ALTIGA-SEP-STATS-MIB.my                        ALTIGA-SEP-STATS-MIB
+ALTIGA-SESSION-STATS-MIB.my            ALTIGA-SESSION-STATS-MIB
+ALTIGA-SSH-STATS-MIB.my                        ALTIGA-SSH-STATS-MIB
+ALTIGA-SSL-STATS-MIB.my                        ALTIGA-SSL-STATS-MIB
+ALTIGA-SYNC-STATS-MIB.my               ALTIGA-SYNC-STATS-MIB
+ALTIGA-T1E1-STATS-MIB.my               ALTIGA-T1E1-STATS-MIB
+ALTIGA-TELNET-STATS-MIB.my             ALTIGA-TELNET-STATS-MIB
+ALTIGA-VERSION-STATS-MIB.my            ALTIGA-VERSION-STATS-MIB
+APPN-DLUR-MIB.my                       APPN-DLUR-MIB
+APPN-MIB.my                            APPN-MIB
+APPN-TRAP-MIB.my                       APPN-TRAP-MIB
+ATM-ACCOUNTING-INFORMATION-MIB.my      ATM-ACCOUNTING-INFORMATION-MIB
+ATM-FORUM-ADDR-REG.my                  ATM-FORUM-ADDR-REG
+ATM-FORUM-MIB.my                       ATM-FORUM-MIB
+ATM-FORUM-TC-MIB.my                    ATM-FORUM-TC-MIB
+ATM-MIB.my                             ATM-MIB
+ATM-RMON-MIB.my                                ATM-RMON-MIB
+ATM-SOFT-PVC-MIB.my                    ATM-SOFT-PVC-MIB
+ATM-TC-MIB.my                          ATM-TC-MIB
+ATM2-MIB.my                            ATM2-MIB
+AWC-VLAN-CFG-MIB.my                    AWC-VLAN-CFG-MIB
+BASIS-GENERIC-MIB.my                   BASIS-GENERIC-MIB
+BASIS-MIB.my                           BASIS-MIB
+BASIS-ONLINE-DIAG-MIB.my               BASIS-ONLINE-DIAG-MIB
+BASIS-RAS-DISK-MIB.my                  BASIS-RAS-DISK-MIB
+BASIS-SERIAL-MIB.my                    BASIS-SERIAL-MIB
+BASIS-SHELF-MIB.my                     BASIS-SHELF-MIB
+BGP4-MIB.my                            BGP4-MIB
+BRIDGE-MIB.my                          BRIDGE-MIB
+CALISTA-DPA-MIB.my                     CALISTA-DPA-MIB
+CISCO-5800-HEALTH-MON-MIB.my           CISCO-5800-HEALTH-MON-MIB
+CISCO-6400-CHASSIS-MIB.my              CISCO-6400-CHASSIS-MIB
+CISCO-90-MIB.my                                CISCO-90-MIB
+CISCO-AAA-CLIENT-CAPABILITY.my         CISCO-AAA-CLIENT-CAPABILITY
+CISCO-AAA-CLIENT-MIB.my                        CISCO-AAA-CLIENT-MIB
+CISCO-AAA-SERVER-CAPABILITY.my         CISCO-AAA-SERVER-CAPABILITY
+CISCO-AAA-SERVER-EXT-CAPABILITY.my     CISCO-AAA-SERVER-EXT-CAPABILITY
+CISCO-AAA-SERVER-EXT-MIB.my            CISCO-AAA-SERVER-EXT-MIB
+CISCO-AAA-SERVER-MIB.my                        CISCO-AAA-SERVER-MIB
+CISCO-AAA-SESSION-MIB.my               CISCO-AAA-SESSION-MIB
+CISCO-AAL5-EXT-MIB.my                  CISCO-AAL5-EXT-MIB
+CISCO-AAL5-MIB.my                      CISCO-AAL5-MIB
+CISCO-ACCESS-ENVMON-MIB.my             CISCO-ACCESS-ENVMON-MIB
+CISCO-ACL-MIB.my                       CISCO-ACL-MIB
+CISCO-ADMISSION-POLICY-MIB.my          CISCO-ADMISSION-POLICY-MIB
+CISCO-ADSL-CAP-LINE-MIB.my             CISCO-ADSL-CAP-LINE-MIB
+CISCO-ADSL-DMT-LINE-MIB.my             CISCO-ADSL-DMT-LINE-MIB
+CISCO-ALPS-MIB.my                      CISCO-ALPS-MIB
+CISCO-ANNOUNCEMENT-MIB.my              CISCO-ANNOUNCEMENT-MIB
+CISCO-AON-STATUS-MIB.my                        CISCO-AON-STATUS-MIB
+CISCO-APPLIANCE-REDUNDANCY-MIB.my      CISCO-APPLIANCE-REDUNDANCY-MIB
+CISCO-APPLICATION-ACCELERATION-CAPABILITY.my                   CISCO-APPLICATION-ACCELERATION-CAPABILITY
+CISCO-APPLICATION-ACCELERATION-MIB.my  CISCO-APPLICATION-ACCELERATION-MIB
+CISCO-APPNAV-CAPABILITY.my             CISCO-APPNAV-CAPABILITY
+CISCO-APPNAV-MIB.my                    CISCO-APPNAV-MIB
+CISCO-APS-EXT-MIB.my                   CISCO-APS-EXT-MIB
+CISCO-APS-MIB.my                       CISCO-APS-MIB
+CISCO-ASN-GATEWAY-MIB.my               CISCO-ASN-GATEWAY-MIB
+CISCO-ASPP-MIB.my                      CISCO-ASPP-MIB
+CISCO-ATM-ACCESS-LIST-MIB.my           CISCO-ATM-ACCESS-LIST-MIB
+CISCO-ATM-ADDR-MIB.my                  CISCO-ATM-ADDR-MIB
+CISCO-ATM-CAPABILITY.my                        CISCO-ATM-CAPABILITY
+CISCO-ATM-CELL-LAYER-CAPABILITY.my     CISCO-ATM-CELL-LAYER-CAPABILITY
+CISCO-ATM-CELL-LAYER-MIB.my            CISCO-ATM-CELL-LAYER-MIB
+CISCO-ATM-CONN-INFO-MIB.my             CISCO-ATM-CONN-INFO-MIB
+CISCO-ATM-CONN-MIB.my                  CISCO-ATM-CONN-MIB
+CISCO-ATM-DUAL-PHY-MIB.my              CISCO-ATM-DUAL-PHY-MIB
+CISCO-ATM-EXT-MIB.my                   CISCO-ATM-EXT-MIB
+CISCO-ATM-IF-MIB.my                    CISCO-ATM-IF-MIB
+CISCO-ATM-IF-PHYS-MIB.my               CISCO-ATM-IF-PHYS-MIB
+CISCO-ATM-NETWORK-CLOCK-MIB.my         CISCO-ATM-NETWORK-CLOCK-MIB
+CISCO-ATM-PVC-MIB.my                   CISCO-ATM-PVC-MIB
+CISCO-ATM-PVCTRAP-EXTN-CAPABILITY.my   CISCO-ATM-PVCTRAP-EXTN-CAPABILITY
+CISCO-ATM-PVCTRAP-EXTN-MIB.my          CISCO-ATM-PVCTRAP-EXTN-MIB
+CISCO-ATM-QOS-MIB.my                   CISCO-ATM-QOS-MIB
+CISCO-ATM-RM-MIB.my                    CISCO-ATM-RM-MIB
+CISCO-ATM-SERVICE-REGISTRY-MIB.my      CISCO-ATM-SERVICE-REGISTRY-MIB
+CISCO-ATM-SIG-DIAG-MIB.my              CISCO-ATM-SIG-DIAG-MIB
+CISCO-ATM-SWITCH-ADDR-MIB.my           CISCO-ATM-SWITCH-ADDR-MIB
+CISCO-ATM-SWITCH-CUG-MIB.my            CISCO-ATM-SWITCH-CUG-MIB
+CISCO-ATM-SWITCH-FR-IWF-MIB.my         CISCO-ATM-SWITCH-FR-IWF-MIB
+CISCO-ATM-SWITCH-FR-RM-MIB.my          CISCO-ATM-SWITCH-FR-RM-MIB
+CISCO-ATM-TRAFFIC-MIB.my               CISCO-ATM-TRAFFIC-MIB
+CISCO-ATM-TRUNK-MIB.my                 CISCO-ATM-TRUNK-MIB
+CISCO-ATM-TRUNK-STAT-CAPABILITY.my     CISCO-ATM-TRUNK-STAT-CAPABILITY
+CISCO-ATM-TRUNK-STAT-MIB.my            CISCO-ATM-TRUNK-STAT-MIB
+CISCO-ATM-VIRTUAL-IF-CAPABILITY.my     CISCO-ATM-VIRTUAL-IF-CAPABILITY
+CISCO-ATM-VIRTUAL-IF-MIB.my            CISCO-ATM-VIRTUAL-IF-MIB
+CISCO-ATM2-MIB.my                      CISCO-ATM2-MIB
+CISCO-AUTH-FRAMEWORK-CAPABILITY.my     CISCO-AUTH-FRAMEWORK-CAPABILITY
+CISCO-AUTH-FRAMEWORK-MIB.my            CISCO-AUTH-FRAMEWORK-MIB
+CISCO-AUTHORIZATION-STATS-MIB.my       CISCO-AUTHORIZATION-STATS-MIB
+CISCO-BBSM-MIB.my                      CISCO-BBSM-MIB
+CISCO-BCP-MIB.my                       CISCO-BCP-MIB
+CISCO-BERT-CAPABILITY.my               CISCO-BERT-CAPABILITY
+CISCO-BERT-MIB.my                      CISCO-BERT-MIB
+CISCO-BGP-POLICY-ACCOUNTING-MIB-CAPABILITY.my  CISCO-BGP-POLICY-ACCOUNTING-MIB-CAPABILITY
+CISCO-BGP-POLICY-ACCOUNTING-MIB.my     CISCO-BGP-POLICY-ACCOUNTING-MIB
+CISCO-BGP4-MIB.my                      CISCO-BGP4-MIB
+CISCO-BITS-CLOCK-CAPABILITY.my         CISCO-BITS-CLOCK-CAPABILITY
+CISCO-BITS-CLOCK-MIB.my                        CISCO-BITS-CLOCK-MIB
+CISCO-BOOT-HWDIAGS-MIB.my              CISCO-BOOT-HWDIAGS-MIB
+CISCO-BRIDGE-CAPABILITY.my             CISCO-BRIDGE-CAPABILITY
+CISCO-BRIDGE-DOMAIN-MIB.my             CISCO-BRIDGE-DOMAIN-MIB
+CISCO-BRIDGE-EXT-CAPABILITY.my         CISCO-BRIDGE-EXT-CAPABILITY
+CISCO-BRIDGE-EXT-MIB.my                        CISCO-BRIDGE-EXT-MIB
+CISCO-BSC-MIB.my                       CISCO-BSC-MIB
+CISCO-BSTUN-MIB.my                     CISCO-BSTUN-MIB
+CISCO-BULK-FILE-CAPABILITY.my          CISCO-BULK-FILE-CAPABILITY
+CISCO-BULK-FILE-MIB.my                 CISCO-BULK-FILE-MIB
+CISCO-BUS-MIB.my                       CISCO-BUS-MIB
+CISCO-C12000-IF-HC-COUNTERS-MIB.my     CISCO-C12000-IF-HC-COUNTERS-MIB
+CISCO-C2900-MIB.my                     CISCO-C2900-MIB
+CISCO-C6200-MIB.my                     CISCO-C6200-MIB
+CISCO-C8500-REDUNDANCY-MIB.my          CISCO-C8500-REDUNDANCY-MIB
+CISCO-CABLE-ADM-C-CAPABILITY.my                CISCO-CABLE-ADM-C-CAPABILITY
+CISCO-CABLE-ADMISSION-CTRL-MIB.my      CISCO-CABLE-ADMISSION-CTRL-MIB
+CISCO-CABLE-AVAILABILITY-MIB.my                CISCO-CABLE-AVAILABILITY-MIB
+CISCO-CABLE-DIAG-CAPABILITY.my         CISCO-CABLE-DIAG-CAPABILITY
+CISCO-CABLE-DIAG-MIB.my                        CISCO-CABLE-DIAG-MIB
+CISCO-CABLE-DSG-IF-MIB.my              CISCO-CABLE-DSG-IF-MIB
+CISCO-CABLE-IRON-BUS-STAT-MIB.my       CISCO-CABLE-IRON-BUS-STAT-MIB
+CISCO-CABLE-L2VPN-MIB.my               CISCO-CABLE-L2VPN-MIB
+CISCO-CABLE-METERING-CAPABILITY.my     CISCO-CABLE-METERING-CAPABILITY
+CISCO-CABLE-METERING-MIB.my            CISCO-CABLE-METERING-MIB
+CISCO-CABLE-QOS-MONITOR-MIB.my         CISCO-CABLE-QOS-MONITOR-MIB
+CISCO-CABLE-SPECTRUM-CAPABILITY.my     CISCO-CABLE-SPECTRUM-CAPABILITY
+CISCO-CABLE-SPECTRUM-MIB.my            CISCO-CABLE-SPECTRUM-MIB
+CISCO-CABLE-WIDEBAND-CAPABILITY.my     CISCO-CABLE-WIDEBAND-CAPABILITY
+CISCO-CABLE-WIDEBAND-MIB.my            CISCO-CABLE-WIDEBAND-MIB
+CISCO-CAC-SYSTEM-MIB.my                        CISCO-CAC-SYSTEM-MIB
+CISCO-CALL-APPLICATION-MIB.my          CISCO-CALL-APPLICATION-MIB
+CISCO-CALL-HISTORY-MIB.my              CISCO-CALL-HISTORY-MIB
+CISCO-CALL-RESOURCE-POOL-MIB.my                CISCO-CALL-RESOURCE-POOL-MIB
+CISCO-CALL-TRACKER-MIB.my              CISCO-CALL-TRACKER-MIB
+CISCO-CALL-TRACKER-MODEM-MIB.my                CISCO-CALL-TRACKER-MODEM-MIB
+CISCO-CALL-TRACKER-TCP-MIB.my          CISCO-CALL-TRACKER-TCP-MIB
+CISCO-CALLHOME-CAPABILITY.my           CISCO-CALLHOME-CAPABILITY
+CISCO-CALLHOME-MIB.my                  CISCO-CALLHOME-MIB
+CISCO-CAR-MIB.my                       CISCO-CAR-MIB
+CISCO-CAS-IF-CAPABILITY.my             CISCO-CAS-IF-CAPABILITY
+CISCO-CAS-IF-EXT-CAPABILITY.my         CISCO-CAS-IF-EXT-CAPABILITY
+CISCO-CAS-IF-EXT-MIB.my                        CISCO-CAS-IF-EXT-MIB
+CISCO-CAS-IF-MIB.my                    CISCO-CAS-IF-MIB
+CISCO-CASA-FA-CAPABILITY.my            CISCO-CASA-FA-CAPABILITY
+CISCO-CASA-FA-MIB.my                   CISCO-CASA-FA-MIB
+CISCO-CASA-MIB.my                      CISCO-CASA-MIB
+CISCO-CAT6K-CROSSBAR-CAPABILITY.my     CISCO-CAT6K-CROSSBAR-CAPABILITY
+CISCO-CAT6K-CROSSBAR-MIB.my            CISCO-CAT6K-CROSSBAR-MIB
+CISCO-CATOS-ACL-QOS-CAPABILITY.my      CISCO-CATOS-ACL-QOS-CAPABILITY
+CISCO-CATOS-ACL-QOS-MIB.my             CISCO-CATOS-ACL-QOS-MIB
+CISCO-CBP-TARGET-MIB.my                        CISCO-CBP-TARGET-MIB
+CISCO-CBP-TARGET-TC-MIB.my             CISCO-CBP-TARGET-TC-MIB
+CISCO-CBP-TC-MIB.my                    CISCO-CBP-TC-MIB
+CISCO-CCM-CAPABILITY.my                        CISCO-CCM-CAPABILITY
+CISCO-CCM-MIB.my                       CISCO-CCM-MIB
+CISCO-CCME-MIB.my                      CISCO-CCME-MIB
+CISCO-CDL-MIB.my                       CISCO-CDL-MIB
+CISCO-CDMA-AHDLC-MIB.my                        CISCO-CDMA-AHDLC-MIB
+CISCO-CDMA-PDSN-CRP-MIB.my             CISCO-CDMA-PDSN-CRP-MIB
+CISCO-CDMA-PDSN-EXT-MIB.my             CISCO-CDMA-PDSN-EXT-MIB
+CISCO-CDMA-PDSN-MIB.my                 CISCO-CDMA-PDSN-MIB
+CISCO-CDP-CAPABILITY.my                        CISCO-CDP-CAPABILITY
+CISCO-CDP-MIB.my                       CISCO-CDP-MIB
+CISCO-CDSTV-AUTHMGR-MIB.my             CISCO-CDSTV-AUTHMGR-MIB
+CISCO-CDSTV-BWMGR-MIB.my               CISCO-CDSTV-BWMGR-MIB
+CISCO-CDSTV-CS-STATS-MIB.my            CISCO-CDSTV-CS-STATS-MIB
+CISCO-CDSTV-FSI-MIB.my                 CISCO-CDSTV-FSI-MIB
+CISCO-CDSTV-INGEST-TUNING-MIB.my       CISCO-CDSTV-INGEST-TUNING-MIB
+CISCO-CDSTV-INGESTMGR-MIB.my           CISCO-CDSTV-INGESTMGR-MIB
+CISCO-CDSTV-ISA-MIB.my                 CISCO-CDSTV-ISA-MIB
+CISCO-CDSTV-SERVER-MIB.my              CISCO-CDSTV-SERVER-MIB
+CISCO-CDSTV-SERVICES-MIB.my            CISCO-CDSTV-SERVICES-MIB
+CISCO-CEF-MIB.my                       CISCO-CEF-MIB
+CISCO-CEF-TC.my                                CISCO-CEF-TC
+CISCO-CFS-MIB.my                       CISCO-CFS-MIB
+CISCO-CHANNEL-MIB.my                   CISCO-CHANNEL-MIB
+CISCO-CIDS-MIB.my                      CISCO-CIDS-MIB
+CISCO-CIPCMPC-MIB.my                   CISCO-CIPCMPC-MIB
+CISCO-CIPCSNA-MIB.my                   CISCO-CIPCSNA-MIB
+CISCO-CIPLAN-MIB.my                    CISCO-CIPLAN-MIB
+CISCO-CIPTCPIP-MIB.my                  CISCO-CIPTCPIP-MIB
+CISCO-CIPTG-MIB.my                     CISCO-CIPTG-MIB
+CISCO-CIRCUIT-INTERFACE-MIB.my         CISCO-CIRCUIT-INTERFACE-MIB
+CISCO-CLASS-BASED-QOS-MIB-CAPABILITY.my        CISCO-CLASS-BASED-QOS-MIB-CAPABILITY
+CISCO-CLASS-BASED-QOS-MIB.my           CISCO-CLASS-BASED-QOS-MIB
+CISCO-CLUSTER-MIB.my                   CISCO-CLUSTER-MIB
+CISCO-CNO-SWITCH-MIB.my                        CISCO-CNO-SWITCH-MIB
+CISCO-COMMON-MGMT-CAPABILITY.my                CISCO-COMMON-MGMT-CAPABILITY
+CISCO-COMMON-MGMT-MIB.my               CISCO-COMMON-MGMT-MIB
+CISCO-COMMON-ROLES-EXT-MIB.my          CISCO-COMMON-ROLES-EXT-MIB
+CISCO-COMMON-ROLES-MIB.my              CISCO-COMMON-ROLES-MIB
+CISCO-COMPRESSION-SERVICE-ADAPTER-MIB.my       CISCO-COMPRESSION-SERVICE-ADAPTER-MIB
+CISCO-CONFIG-COPY-CAPABILITY.my                CISCO-CONFIG-COPY-CAPABILITY
+CISCO-CONFIG-COPY-MIB.my               CISCO-CONFIG-COPY-MIB
+CISCO-CONFIG-MAN-CAPABILITY.my         CISCO-CONFIG-MAN-CAPABILITY
+CISCO-CONFIG-MAN-MIB.my                        CISCO-CONFIG-MAN-MIB
+CISCO-CONTACT-CENTER-APPS-MIB.my       CISCO-CONTACT-CENTER-APPS-MIB
+CISCO-CONTENT-DELIVERY-STREAMING-MIB.my        CISCO-CONTENT-DELIVERY-STREAMING-MIB
+CISCO-CONTENT-ENGINE-MIB.my            CISCO-CONTENT-ENGINE-MIB
+CISCO-CONTENT-NETWORK-MIB.my           CISCO-CONTENT-NETWORK-MIB
+CISCO-CONTENT-SERVICES-CAPABILITY.my   CISCO-CONTENT-SERVICES-CAPABILITY
+CISCO-CONTENT-SERVICES-MIB.my          CISCO-CONTENT-SERVICES-MIB
+CISCO-CONTEXT-MAPPING-CAPABILITY.my    CISCO-CONTEXT-MAPPING-CAPABILITY
+CISCO-CONTEXT-MAPPING-MIB.my           CISCO-CONTEXT-MAPPING-MIB
+CISCO-COPS-CLIENT-CAPABILITY.my                CISCO-COPS-CLIENT-CAPABILITY
+CISCO-COPS-CLIENT-MIB.my               CISCO-COPS-CLIENT-MIB
+CISCO-CRYPTO-ACCELERATOR-MIB.my                CISCO-CRYPTO-ACCELERATOR-MIB
+CISCO-CSG-CAPABILITY.my                        CISCO-CSG-CAPABILITY
+CISCO-CSG-MIB.my                       CISCO-CSG-MIB
+CISCO-CUICAPPS-MIB.my                  CISCO-CUICAPPS-MIB
+CISCO-CVP-MIB.my                       CISCO-CVP-MIB
+CISCO-DATA-COLLECTION-CAPABILITY.my    CISCO-DATA-COLLECTION-CAPABILITY
+CISCO-DATA-COLLECTION-MIB.my           CISCO-DATA-COLLECTION-MIB
+CISCO-DDP-IAPP-MIB.my                  CISCO-DDP-IAPP-MIB
+CISCO-DEVICE-EXCEPTION-REPORTING-MIB.my        CISCO-DEVICE-EXCEPTION-REPORTING-MIB
+CISCO-DEVICE-LOCATION-MIB.my           CISCO-DEVICE-LOCATION-MIB
+CISCO-DHCP-SNOOPING-CAPABILITY.my      CISCO-DHCP-SNOOPING-CAPABILITY
+CISCO-DHCP-SNOOPING-MIB.my             CISCO-DHCP-SNOOPING-MIB
+CISCO-DIAL-CONTROL-MIB.my              CISCO-DIAL-CONTROL-MIB
+CISCO-DIAMETER-BASE-PROTOCOL-CAPABILITY.my     CISCO-DIAMETER-BASE-PROTOCOL-CAPABILITY
+CISCO-DIAMETER-BASE-PROTOCOL-MIB.my    CISCO-DIAMETER-BASE-PROTOCOL-MIB
+CISCO-DIAMETER-CC-APPL-CAPABILITY.my   CISCO-DIAMETER-CC-APPL-CAPABILITY
+CISCO-DIAMETER-CC-APPL-MIB.my          CISCO-DIAMETER-CC-APPL-MIB
+CISCO-DIAMETER-SG-CAPABILITY.my                CISCO-DIAMETER-SG-CAPABILITY
+CISCO-DIAMETER-SG-MIB.my               CISCO-DIAMETER-SG-MIB
+CISCO-DIFFSERV-EXT-MIB.my              CISCO-DIFFSERV-EXT-MIB
+CISCO-DIGITAL-MEDIA-SYSTEMS-CAPABILITY.my      CISCO-DIGITAL-MEDIA-SYSTEMS-CAPABILITY
+CISCO-DIGITAL-MEDIA-SYSTEMS-MIB.my     CISCO-DIGITAL-MEDIA-SYSTEMS-MIB
+CISCO-DISMAN-EVENT-CAPABILITY.my       CISCO-DISMAN-EVENT-CAPABILITY
+CISCO-DISMAN-EXPRESSION-CAPABILITY.my  CISCO-DISMAN-EXPRESSION-CAPABILITY
+CISCO-DIST-DIRECTOR-CAPABILITY.my      CISCO-DIST-DIRECTOR-CAPABILITY
+CISCO-DIST-DIRECTOR-MIB.my             CISCO-DIST-DIRECTOR-MIB
+CISCO-DLCSW-MIB.my                     CISCO-DLCSW-MIB
+CISCO-DLSW-EXT-MIB.my                  CISCO-DLSW-EXT-MIB
+CISCO-DLSW-MIB.my                      CISCO-DLSW-MIB
+CISCO-DM-MIB.my                                CISCO-DM-MIB
+CISCO-DNS-CLIENT-CAPABILITY.my         CISCO-DNS-CLIENT-CAPABILITY
+CISCO-DNS-CLIENT-MIB.my                        CISCO-DNS-CLIENT-MIB
+CISCO-DNS-SERVER-MIB.my                        CISCO-DNS-SERVER-MIB
+CISCO-DOCS-EXT-MIB.my                  CISCO-DOCS-EXT-MIB
+CISCO-DOCS-REMOTE-QUERY-MIB.my         CISCO-DOCS-REMOTE-QUERY-MIB
+CISCO-DOT11-ANTENNA-MIB.my             CISCO-DOT11-ANTENNA-MIB
+CISCO-DOT11-ASSOCIATION-MIB.my         CISCO-DOT11-ASSOCIATION-MIB
+CISCO-DOT11-CONTEXT-SERVICES-CAPABILITY.my     CISCO-DOT11-CONTEXT-SERVICES-CAPABILITY
+CISCO-DOT11-CONTEXT-SERVICES-CLIENT-CAPABILITY.my      CISCO-DOT11-CONTEXT-SERVICES-CLIENT-CAPABILITY
+CISCO-DOT11-CONTEXT-SERVICES-CLIENT-MIB.my     CISCO-DOT11-CONTEXT-SERVICES-CLIENT-MIB
+CISCO-DOT11-CONTEXT-SERVICES-MANAGER-MIB.my    CISCO-DOT11-CONTEXT-SERVICES-MANAGER-MIB
+CISCO-DOT11-CONTEXT-SERVICES-MIB.my    CISCO-DOT11-CONTEXT-SERVICES-MIB
+CISCO-DOT11-HT-MAC-CAPABILITY.my       CISCO-DOT11-HT-MAC-CAPABILITY
+CISCO-DOT11-HT-MAC-MIB.my              CISCO-DOT11-HT-MAC-MIB
+CISCO-DOT11-HT-PHY-CAPABILITY.my       CISCO-DOT11-HT-PHY-CAPABILITY
+CISCO-DOT11-HT-PHY-MIB.my              CISCO-DOT11-HT-PHY-MIB
+CISCO-DOT11-IF-MIB.my                  CISCO-DOT11-IF-MIB
+CISCO-DOT11-LBS-MIB.my                 CISCO-DOT11-LBS-MIB
+CISCO-DOT11-QOS-MIB.my                 CISCO-DOT11-QOS-MIB
+CISCO-DOT11-RADAR-MIB.my               CISCO-DOT11-RADAR-MIB
+CISCO-DOT11-RADIO-DIAGNOSTIC-CAPABILITY.my     CISCO-DOT11-RADIO-DIAGNOSTIC-CAPABILITY
+CISCO-DOT11-RADIO-DIAGNOSTIC-MIB.my    CISCO-DOT11-RADIO-DIAGNOSTIC-MIB
+CISCO-DOT11-SSID-SECURITY-MIB.my       CISCO-DOT11-SSID-SECURITY-MIB
+CISCO-DOT11-WIDS-CAPABILITY.my         CISCO-DOT11-WIDS-CAPABILITY
+CISCO-DOT11-WIDS-MIB.my                        CISCO-DOT11-WIDS-MIB
+CISCO-DOT3-OAM-MIB.my                  CISCO-DOT3-OAM-MIB
+CISCO-DS0-CROSS-CONNECT-MIB.my         CISCO-DS0-CROSS-CONNECT-MIB
+CISCO-DS0BUNDLE-EXT-MIB.my             CISCO-DS0BUNDLE-EXT-MIB
+CISCO-DS0BUNDLE-MIB.my                 CISCO-DS0BUNDLE-MIB
+CISCO-DS1-CAPABILITY.my                        CISCO-DS1-CAPABILITY
+CISCO-DS1-EXT-MIB.my                   CISCO-DS1-EXT-MIB
+CISCO-DS3-CAPABILITY.my                        CISCO-DS3-CAPABILITY
+CISCO-DS3-EXT-CAPABILITY.my            CISCO-DS3-EXT-CAPABILITY
+CISCO-DS3-MIB.my                       CISCO-DS3-MIB
+CISCO-DSG-IF-EXT-MIB.my                        CISCO-DSG-IF-EXT-MIB
+CISCO-DSL-PROVISION-MIB.my             CISCO-DSL-PROVISION-MIB
+CISCO-DSP-MGMT-CAPABILITY.my           CISCO-DSP-MGMT-CAPABILITY
+CISCO-DSP-MGMT-MIB.my                  CISCO-DSP-MGMT-MIB
+CISCO-DSPU-MIB.my                      CISCO-DSPU-MIB
+CISCO-DTI-EXT-MIB.my                   CISCO-DTI-EXT-MIB
+CISCO-DYNAMIC-ARP-INSPECTION-CAPABILITY.my     CISCO-DYNAMIC-ARP-INSPECTION-CAPABILITY
+CISCO-DYNAMIC-ARP-INSPECTION-MIB.my    CISCO-DYNAMIC-ARP-INSPECTION-MIB
+CISCO-DYNAMIC-PORT-VSAN-MIB.my         CISCO-DYNAMIC-PORT-VSAN-MIB
+CISCO-DYNAMIC-TEMPLATE-MIB.my          CISCO-DYNAMIC-TEMPLATE-MIB
+CISCO-DYNAMIC-TEMPLATE-TC-MIB.my       CISCO-DYNAMIC-TEMPLATE-TC-MIB
+CISCO-EIGRP-MIB.my                     CISCO-EIGRP-MIB
+CISCO-EMBEDDED-EVENT-MGR-MIB.my                CISCO-EMBEDDED-EVENT-MGR-MIB
+CISCO-ENERGYWISE-MIB.my                        CISCO-ENERGYWISE-MIB
+CISCO-ENH-IPSEC-FLOW-CAPABILITY.my     CISCO-ENH-IPSEC-FLOW-CAPABILITY
+CISCO-ENHANCED-IMAGE-CAPABILITY.my     CISCO-ENHANCED-IMAGE-CAPABILITY
+CISCO-ENHANCED-IMAGE-MIB.my            CISCO-ENHANCED-IMAGE-MIB
+CISCO-ENHANCED-IPSEC-FLOW-MIB.my       CISCO-ENHANCED-IPSEC-FLOW-MIB
+CISCO-ENHANCED-MEMPOOL-CAPABILITY.my   CISCO-ENHANCED-MEMPOOL-CAPABILITY
+CISCO-ENHANCED-MEMPOOL-MIB.my          CISCO-ENHANCED-MEMPOOL-MIB
+CISCO-ENHANCED-SLB-CAPABILITY.my       CISCO-ENHANCED-SLB-CAPABILITY
+CISCO-ENHANCED-SLB-MIB.my              CISCO-ENHANCED-SLB-MIB
+CISCO-ENHANCED-WRED-MIB.my             CISCO-ENHANCED-WRED-MIB
+CISCO-ENTITY-ALARM-MIB.my              CISCO-ENTITY-ALARM-MIB
+CISCO-ENTITY-ASSET-CAPABILITY.my       CISCO-ENTITY-ASSET-CAPABILITY
+CISCO-ENTITY-ASSET-MIB.my              CISCO-ENTITY-ASSET-MIB
+CISCO-ENTITY-CAPABILITY.my             CISCO-ENTITY-CAPABILITY
+CISCO-ENTITY-DIAG-CAPABILITY.my                CISCO-ENTITY-DIAG-CAPABILITY
+CISCO-ENTITY-DIAG-MIB.my               CISCO-ENTITY-DIAG-MIB
+CISCO-ENTITY-DIAG-TC-MIB.my            CISCO-ENTITY-DIAG-TC-MIB
+CISCO-ENTITY-DISPLAY-CAPABILITY.my     CISCO-ENTITY-DISPLAY-CAPABILITY
+CISCO-ENTITY-DISPLAY-MIB.my            CISCO-ENTITY-DISPLAY-MIB
+CISCO-ENTITY-EXT-CAPABILITY.my         CISCO-ENTITY-EXT-CAPABILITY
+CISCO-ENTITY-EXT-MIB.my                        CISCO-ENTITY-EXT-MIB
+CISCO-ENTITY-FRU-CONTROL-CAPABILITY.my CISCO-ENTITY-FRU-CONTROL-CAPABILITY
+CISCO-ENTITY-FRU-CONTROL-MIB.my                CISCO-ENTITY-FRU-CONTROL-MIB
+CISCO-ENTITY-PERFORMANCE-MIB.my                CISCO-ENTITY-PERFORMANCE-MIB
+CISCO-ENTITY-PFE-MIB.my                        CISCO-ENTITY-PFE-MIB
+CISCO-ENTITY-PROVISIONING-MIB.my       CISCO-ENTITY-PROVISIONING-MIB
+CISCO-ENTITY-QFP-MIB.my                        CISCO-ENTITY-QFP-MIB
+CISCO-ENTITY-REDUNDANCY-MIB.my         CISCO-ENTITY-REDUNDANCY-MIB
+CISCO-ENTITY-REDUNDANCY-TC-MIB.my      CISCO-ENTITY-REDUNDANCY-TC-MIB
+CISCO-ENTITY-SENSOR-CAPABILITY.my      CISCO-ENTITY-SENSOR-CAPABILITY
+CISCO-ENTITY-SENSOR-EXT-MIB.my         CISCO-ENTITY-SENSOR-EXT-MIB
+CISCO-ENTITY-SENSOR-HISTORY-MIB.my     CISCO-ENTITY-SENSOR-HISTORY-MIB
+CISCO-ENTITY-SENSOR-MIB.my             CISCO-ENTITY-SENSOR-MIB
+CISCO-ENTITY-SENSOR-RFC-CAPABILITY.my  CISCO-ENTITY-SENSOR-RFC-CAPABILITY
+CISCO-ENTITY-VENDORTYPE-OID-MIB.my     CISCO-ENTITY-VENDORTYPE-OID-MIB
+CISCO-ENVMON-CAPABILITY.my             CISCO-ENVMON-CAPABILITY
+CISCO-ENVMON-MIB.my                    CISCO-ENVMON-MIB
+CISCO-EPC-GATEWAY-MIB.my               CISCO-EPC-GATEWAY-MIB
+CISCO-EPM-NOTIFICATION-MIB.my          CISCO-EPM-NOTIFICATION-MIB
+CISCO-ERM-CAPABILITY.my                        CISCO-ERM-CAPABILITY
+CISCO-ERM-MIB.my                       CISCO-ERM-MIB
+CISCO-ERR-DISABLE-CAPABILITY.my                CISCO-ERR-DISABLE-CAPABILITY
+CISCO-ERR-DISABLE-MIB.my               CISCO-ERR-DISABLE-MIB
+CISCO-ETHER-CFM-CAPABILITY.my          CISCO-ETHER-CFM-CAPABILITY
+CISCO-ETHER-CFM-MIB.my                 CISCO-ETHER-CFM-MIB
+CISCO-ETHER-WIS-CAPABILITY.my          CISCO-ETHER-WIS-CAPABILITY
+CISCO-ETHERLIKE-CAPABILITY.my          CISCO-ETHERLIKE-CAPABILITY
+CISCO-ETHERLIKE-EXT-CAPABILITY.my      CISCO-ETHERLIKE-EXT-CAPABILITY
+CISCO-ETHERLIKE-EXT-MIB.my             CISCO-ETHERLIKE-EXT-MIB
+CISCO-ETHERNET-ACCESS-MIB.my           CISCO-ETHERNET-ACCESS-MIB
+CISCO-ETHERNET-FABRIC-EXTENDER-MIB.my  CISCO-ETHERNET-FABRIC-EXTENDER-MIB
+CISCO-EVC-CAPABILITY.my                        CISCO-EVC-CAPABILITY
+CISCO-EVC-MIB.my                       CISCO-EVC-MIB
+CISCO-EXT-SCSI-MIB.my                  CISCO-EXT-SCSI-MIB
+CISCO-FABRIC-C12K-MIB.my               CISCO-FABRIC-C12K-MIB
+CISCO-FABRIC-HFR-MIB-CAPABILITY.my     CISCO-FABRIC-HFR-MIB-CAPABILITY
+CISCO-FABRIC-HFR-MIB.my                        CISCO-FABRIC-HFR-MIB
+CISCO-FABRIC-MCAST-APPL-MIB-CAPABILITY.my      CISCO-FABRIC-MCAST-APPL-MIB-CAPABILITY
+CISCO-FABRIC-MCAST-APPL-MIB.my         CISCO-FABRIC-MCAST-APPL-MIB
+CISCO-FABRIC-MCAST-MIB-CAPABILITY.my   CISCO-FABRIC-MCAST-MIB-CAPABILITY
+CISCO-FABRIC-MCAST-MIB.my              CISCO-FABRIC-MCAST-MIB
+CISCO-FABRICPATH-TOPOLOGY-CAPABILITY.my        CISCO-FABRICPATH-TOPOLOGY-CAPABILITY
+CISCO-FABRICPATH-TOPOLOGY-MIB.my       CISCO-FABRICPATH-TOPOLOGY-MIB
+CISCO-FC-DEVICE-ALIAS-MIB.my           CISCO-FC-DEVICE-ALIAS-MIB
+CISCO-FC-FE-MIB.my                     CISCO-FC-FE-MIB
+CISCO-FC-MGMT-MIB.my                   CISCO-FC-MGMT-MIB
+CISCO-FC-MULTICAST-MIB.my              CISCO-FC-MULTICAST-MIB
+CISCO-FC-PM-MIB.my                     CISCO-FC-PM-MIB
+CISCO-FC-ROUTE-MIB.my                  CISCO-FC-ROUTE-MIB
+CISCO-FC-SDV-MIB.my                    CISCO-FC-SDV-MIB
+CISCO-FC-SPAN-MIB.my                   CISCO-FC-SPAN-MIB
+CISCO-FC-TUNNEL-MIB.my                 CISCO-FC-TUNNEL-MIB
+CISCO-FCC-MIB.my                       CISCO-FCC-MIB
+CISCO-FCIP-MGMT-EXT-MIB.my             CISCO-FCIP-MGMT-EXT-MIB
+CISCO-FCIP-MGMT-MIB.my                 CISCO-FCIP-MGMT-MIB
+CISCO-FCOE-MIB.my                      CISCO-FCOE-MIB
+CISCO-FCPING-MIB.my                    CISCO-FCPING-MIB
+CISCO-FCS-MIB.my                       CISCO-FCS-MIB
+CISCO-FCSP-MIB.my                      CISCO-FCSP-MIB
+CISCO-FCTRACEROUTE-MIB.my              CISCO-FCTRACEROUTE-MIB
+CISCO-FDMI-MIB.my                      CISCO-FDMI-MIB
+CISCO-FEATURE-CONTROL-MIB.my           CISCO-FEATURE-CONTROL-MIB
+CISCO-FICON-MIB.my                     CISCO-FICON-MIB
+CISCO-FILTER-GROUP-MIB.my              CISCO-FILTER-GROUP-MIB
+CISCO-FIPS-STATS-MIB.my                        CISCO-FIPS-STATS-MIB
+CISCO-FIREWALL-MIB.my                  CISCO-FIREWALL-MIB
+CISCO-FIREWALL-TC.my                   CISCO-FIREWALL-TC
+CISCO-FLASH-CAPABILITY.my              CISCO-FLASH-CAPABILITY
+CISCO-FLASH-MIB.my                     CISCO-FLASH-MIB
+CISCO-FLEX-LINKS-CAPABILITY.my         CISCO-FLEX-LINKS-CAPABILITY
+CISCO-FLEX-LINKS-MIB.my                        CISCO-FLEX-LINKS-MIB
+CISCO-FLOW-CLONE-MIB.my                        CISCO-FLOW-CLONE-MIB
+CISCO-FLOW-METADATA-MIB.my             CISCO-FLOW-METADATA-MIB
+CISCO-FLOW-MONITOR-MIB.my              CISCO-FLOW-MONITOR-MIB
+CISCO-FLOW-MONITOR-TC-MIB.my           CISCO-FLOW-MONITOR-TC-MIB
+CISCO-FRAME-RELAY-MIB.my               CISCO-FRAME-RELAY-MIB
+CISCO-FSPF-MIB.my                      CISCO-FSPF-MIB
+CISCO-FTP-CLIENT-CAPABILITY.my         CISCO-FTP-CLIENT-CAPABILITY
+CISCO-FTP-CLIENT-MIB.my                        CISCO-FTP-CLIENT-MIB
+CISCO-GATEKEEPER-MIB.my                        CISCO-GATEKEEPER-MIB
+CISCO-GDOI-MIB.my                      CISCO-GDOI-MIB
+CISCO-GGSN-CAPABILITY.my               CISCO-GGSN-CAPABILITY
+CISCO-GGSN-EXT-MIB.my                  CISCO-GGSN-EXT-MIB
+CISCO-GGSN-GEO-MIB.my                  CISCO-GGSN-GEO-MIB
+CISCO-GGSN-MIB.my                      CISCO-GGSN-MIB
+CISCO-GGSN-QOS-CAPABILITY.my           CISCO-GGSN-QOS-CAPABILITY
+CISCO-GGSN-QOS-MIB.my                  CISCO-GGSN-QOS-MIB
+CISCO-GGSN-SERVICE-AWARE-MIB.my                CISCO-GGSN-SERVICE-AWARE-MIB
+CISCO-GPRS-ACC-PT-CAPABILITY.my                CISCO-GPRS-ACC-PT-CAPABILITY
+CISCO-GPRS-ACC-PT-MIB.my               CISCO-GPRS-ACC-PT-MIB
+CISCO-GPRS-CHARGING-CAPABILITY.my      CISCO-GPRS-CHARGING-CAPABILITY
+CISCO-GPRS-CHARGING-MIB.my             CISCO-GPRS-CHARGING-MIB
+CISCO-GPRS-GTP-CAPABILITY.my           CISCO-GPRS-GTP-CAPABILITY
+CISCO-GPRS-GTP-MIB.my                  CISCO-GPRS-GTP-MIB
+CISCO-GPRS-ISGSN-MIB.my                        CISCO-GPRS-ISGSN-MIB
+CISCO-GPRS-L2RLY-MIB.my                        CISCO-GPRS-L2RLY-MIB
+CISCO-GSLB-DNS-CAPABILITY.my           CISCO-GSLB-DNS-CAPABILITY
+CISCO-GSLB-DNS-MIB.my                  CISCO-GSLB-DNS-MIB
+CISCO-GSLB-HEALTH-MON-CAPABILITY.my    CISCO-GSLB-HEALTH-MON-CAPABILITY
+CISCO-GSLB-HEALTH-MON-MIB.my           CISCO-GSLB-HEALTH-MON-MIB
+CISCO-GSLB-SYSTEM-CAPABILITY.my                CISCO-GSLB-SYSTEM-CAPABILITY
+CISCO-GSLB-SYSTEM-MIB.my               CISCO-GSLB-SYSTEM-MIB
+CISCO-GSLB-TC-MIB.my                   CISCO-GSLB-TC-MIB
+CISCO-GTP-CAPABILITY.my                        CISCO-GTP-CAPABILITY
+CISCO-GTP-DIRECTOR-MIB.my              CISCO-GTP-DIRECTOR-MIB
+CISCO-GTP-MIB.my                       CISCO-GTP-MIB
+CISCO-GTPV2-MIB.my                     CISCO-GTPV2-MIB
+CISCO-H225-MIB.my                      CISCO-H225-MIB
+CISCO-H320-DIAL-CONTROL-MIB.my         CISCO-H320-DIAL-CONTROL-MIB
+CISCO-H323-TC-MIB.my                   CISCO-H323-TC-MIB
+CISCO-H324-DIAL-CONTROL-MIB.my         CISCO-H324-DIAL-CONTROL-MIB
+CISCO-HARDWARE-IP-VERIFY-CAPABILITY.my CISCO-HARDWARE-IP-VERIFY-CAPABILITY
+CISCO-HARDWARE-IP-VERIFY-MIB.my                CISCO-HARDWARE-IP-VERIFY-MIB
+CISCO-HC-ALARM-CAPABILITY.my           CISCO-HC-ALARM-CAPABILITY
+CISCO-HC-ALARM-MIB.my                  CISCO-HC-ALARM-MIB
+CISCO-HC-RMON-CAPABILITY.my            CISCO-HC-RMON-CAPABILITY
+CISCO-HEALTH-MONITOR-MIB.my            CISCO-HEALTH-MONITOR-MIB
+CISCO-HOST-RESOURCES-CAPABILITY.my     CISCO-HOST-RESOURCES-CAPABILITY
+CISCO-HSRP-CAPABILITY.my               CISCO-HSRP-CAPABILITY
+CISCO-HSRP-EXT-CAPABILITY.my           CISCO-HSRP-EXT-CAPABILITY
+CISCO-HSRP-EXT-MIB.my                  CISCO-HSRP-EXT-MIB
+CISCO-HSRP-MIB.my                      CISCO-HSRP-MIB
+CISCO-HW-MODULE-CONTROL-CAPABILITY.my  CISCO-HW-MODULE-CONTROL-CAPABILITY
+CISCO-HW-MODULE-CONTROL-MIB.my         CISCO-HW-MODULE-CONTROL-MIB
+CISCO-ICSUDSU-MIB.my                   CISCO-ICSUDSU-MIB
+CISCO-IDSL-LINE-MIB.my                 CISCO-IDSL-LINE-MIB
+CISCO-IEEE-CFM-MIB.my                  CISCO-IEEE-CFM-MIB
+CISCO-IEEE8021-CFM-CAPABILITY.my       CISCO-IEEE8021-CFM-CAPABILITY
+CISCO-IEEE8021-CFM-EXT-CAPABILITY.my   CISCO-IEEE8021-CFM-EXT-CAPABILITY
+CISCO-IEEE8021-CFM-EXT-MIB.my          CISCO-IEEE8021-CFM-EXT-MIB
+CISCO-IEEE8021-CFM-V2-CAPABILITY.my    CISCO-IEEE8021-CFM-V2-CAPABILITY
+CISCO-IEEE8021-PAE-CAPABILITY.my       CISCO-IEEE8021-PAE-CAPABILITY
+CISCO-IEEE8023-LAG-CAPABILITY.my       CISCO-IEEE8023-LAG-CAPABILITY
+CISCO-IETF-ATM2-PVCTRAP-MIB.my         CISCO-IETF-ATM2-PVCTRAP-MIB
+CISCO-IETF-BFD-MIB.my                  CISCO-IETF-BFD-MIB
+CISCO-IETF-DHCP-SERVER-CAPABILITY.my   CISCO-IETF-DHCP-SERVER-CAPABILITY
+CISCO-IETF-DHCP-SERVER-EXT-CAPABILITY.my       CISCO-IETF-DHCP-SERVER-EXT-CAPABILITY
+CISCO-IETF-DHCP-SERVER-EXT-MIB.my      CISCO-IETF-DHCP-SERVER-EXT-MIB
+CISCO-IETF-DHCP-SERVER-MIB.my          CISCO-IETF-DHCP-SERVER-MIB
+CISCO-IETF-DOT11-QOS-EXT-MIB.my                CISCO-IETF-DOT11-QOS-EXT-MIB
+CISCO-IETF-DOT11-QOS-MIB.my            CISCO-IETF-DOT11-QOS-MIB
+CISCO-IETF-FRR-CAPABILITY.my           CISCO-IETF-FRR-CAPABILITY
+CISCO-IETF-FRR-MIB.my                  CISCO-IETF-FRR-MIB
+CISCO-IETF-IP-FORWARD-MIB.my           CISCO-IETF-IP-FORWARD-MIB
+CISCO-IETF-IP-MIB.my                   CISCO-IETF-IP-MIB
+CISCO-IETF-IPMROUTE-CAPABILITY.my      CISCO-IETF-IPMROUTE-CAPABILITY
+CISCO-IETF-IPMROUTE-MIB.my             CISCO-IETF-IPMROUTE-MIB
+CISCO-IETF-ISIS-CAPABILITY.my          CISCO-IETF-ISIS-CAPABILITY
+CISCO-IETF-ISIS-MIB.my                 CISCO-IETF-ISIS-MIB
+CISCO-IETF-ISNS-MGMT-MIB.my            CISCO-IETF-ISNS-MGMT-MIB
+CISCO-IETF-MEGACO-MIB.my               CISCO-IETF-MEGACO-MIB
+CISCO-IETF-MPLS-ID-STD-03-MIB.my       CISCO-IETF-MPLS-ID-STD-03-MIB
+CISCO-IETF-MPLS-TE-EXT-STD-03-MIB.my   CISCO-IETF-MPLS-TE-EXT-STD-03-MIB
+CISCO-IETF-MPLS-TE-P2MP-STD-MIB.my     CISCO-IETF-MPLS-TE-P2MP-STD-MIB
+CISCO-IETF-MPLS-VPN-CAPABILITY.my      CISCO-IETF-MPLS-VPN-CAPABILITY
+CISCO-IETF-MSDP-MIB.my                 CISCO-IETF-MSDP-MIB
+CISCO-IETF-NAT-CAPABILITY.my           CISCO-IETF-NAT-CAPABILITY
+CISCO-IETF-NAT-MIB.my                  CISCO-IETF-NAT-MIB
+CISCO-IETF-PIM-CAPABILITY.my           CISCO-IETF-PIM-CAPABILITY
+CISCO-IETF-PIM-EXT-CAPABILITY.my       CISCO-IETF-PIM-EXT-CAPABILITY
+CISCO-IETF-PIM-EXT-MIB.my              CISCO-IETF-PIM-EXT-MIB
+CISCO-IETF-PIM-MIB.my                  CISCO-IETF-PIM-MIB
+CISCO-IETF-PPVPN-MPLS-VPN-MIB.my       CISCO-IETF-PPVPN-MPLS-VPN-MIB
+CISCO-IETF-PW-ATM-MIB.my               CISCO-IETF-PW-ATM-MIB
+CISCO-IETF-PW-CAPABILITY.my            CISCO-IETF-PW-CAPABILITY
+CISCO-IETF-PW-ENET-CAPABILITY.my       CISCO-IETF-PW-ENET-CAPABILITY
+CISCO-IETF-PW-ENET-MIB.my              CISCO-IETF-PW-ENET-MIB
+CISCO-IETF-PW-FR-MIB.my                        CISCO-IETF-PW-FR-MIB
+CISCO-IETF-PW-MIB.my                   CISCO-IETF-PW-MIB
+CISCO-IETF-PW-MPLS-CAPABILITY.my       CISCO-IETF-PW-MPLS-CAPABILITY
+CISCO-IETF-PW-MPLS-MIB.my              CISCO-IETF-PW-MPLS-MIB
+CISCO-IETF-PW-TC-MIB.my                        CISCO-IETF-PW-TC-MIB
+CISCO-IETF-PW-TDM-MIB.my               CISCO-IETF-PW-TDM-MIB
+CISCO-IETF-SCTP-CAPABILITY.my          CISCO-IETF-SCTP-CAPABILITY
+CISCO-IETF-SCTP-EXT-CAPABILITY.my      CISCO-IETF-SCTP-EXT-CAPABILITY
+CISCO-IETF-SCTP-EXT-MIB.my             CISCO-IETF-SCTP-EXT-MIB
+CISCO-IETF-SCTP-MIB.my                 CISCO-IETF-SCTP-MIB
+CISCO-IETF-VDSL-LINE-MIB.my            CISCO-IETF-VDSL-LINE-MIB
+CISCO-IETF-VPLS-BGP-EXT-MIB.my         CISCO-IETF-VPLS-BGP-EXT-MIB
+CISCO-IETF-VPLS-GENERIC-MIB.my         CISCO-IETF-VPLS-GENERIC-MIB
+CISCO-IETF-VPLS-LDP-MIB.my             CISCO-IETF-VPLS-LDP-MIB
+CISCO-IETF-VRRP-07-MIB.my              CISCO-IETF-VRRP-07-MIB
+CISCO-IETF-VRRP-MIB.my                 CISCO-IETF-VRRP-MIB
+CISCO-IF-CALL-SERVICE-MIB.my           CISCO-IF-CALL-SERVICE-MIB
+CISCO-IF-CAPABILITY.my                 CISCO-IF-CAPABILITY
+CISCO-IF-EXTENSION-CAPABILITY.my       CISCO-IF-EXTENSION-CAPABILITY
+CISCO-IF-EXTENSION-MIB.my              CISCO-IF-EXTENSION-MIB
+CISCO-IF-LINK-CONFIG-MIB.my            CISCO-IF-LINK-CONFIG-MIB
+CISCO-IF-LOOPBACK-MIB.my               CISCO-IF-LOOPBACK-MIB
+CISCO-IF-MONITOR-NOTIF-MIB.my          CISCO-IF-MONITOR-NOTIF-MIB
+CISCO-IF-THRESHOLD-MIB.my              CISCO-IF-THRESHOLD-MIB
+CISCO-IGMP-FILTER-CAPABILITY.my                CISCO-IGMP-FILTER-CAPABILITY
+CISCO-IGMP-FILTER-MIB.my               CISCO-IGMP-FILTER-MIB
+CISCO-IGMP-SNOOPING-CAPABILITY.my      CISCO-IGMP-SNOOPING-CAPABILITY
+CISCO-IGMP-SNOOPING-MIB.my             CISCO-IGMP-SNOOPING-MIB
+CISCO-IKE-CONF-CAPABILITY.my           CISCO-IKE-CONF-CAPABILITY
+CISCO-IKE-CONFIGURATION-MIB.my         CISCO-IKE-CONFIGURATION-MIB
+CISCO-IKE-FLOW-CAPABILITY.my           CISCO-IKE-FLOW-CAPABILITY
+CISCO-IKE-FLOW-EXT-CAPABILITY.my       CISCO-IKE-FLOW-EXT-CAPABILITY
+CISCO-IKE-FLOW-EXT-MIB.my              CISCO-IKE-FLOW-EXT-MIB
+CISCO-IKE-FLOW-MIB.my                  CISCO-IKE-FLOW-MIB
+CISCO-IMA-CAPABILITY.my                        CISCO-IMA-CAPABILITY
+CISCO-IMA-EXT-CAPABILITY.my            CISCO-IMA-EXT-CAPABILITY
+CISCO-IMA-MIB.my                       CISCO-IMA-MIB
+CISCO-IMAGE-CAPABILITY.my              CISCO-IMAGE-CAPABILITY
+CISCO-IMAGE-CHECK-MIB.my               CISCO-IMAGE-CHECK-MIB
+CISCO-IMAGE-LICENSE-MGMT-MIB.my                CISCO-IMAGE-LICENSE-MGMT-MIB
+CISCO-IMAGE-MIB.my                     CISCO-IMAGE-MIB
+CISCO-IMAGE-TC.my                      CISCO-IMAGE-TC
+CISCO-IMAGE-UPGRADE-MIB.my             CISCO-IMAGE-UPGRADE-MIB
+CISCO-INTERFACE-XCVR-MONITOR-MIB.my    CISCO-INTERFACE-XCVR-MONITOR-MIB
+CISCO-INTERFACETOPN-CAPABILITY.my      CISCO-INTERFACETOPN-CAPABILITY
+CISCO-INTERFACETOPN-EXT-CAPABILITY.my  CISCO-INTERFACETOPN-EXT-CAPABILITY
+CISCO-INTERFACETOPN-EXT-MIB.my         CISCO-INTERFACETOPN-EXT-MIB
+CISCO-IP-ADDRESS-POOL-MIB.my           CISCO-IP-ADDRESS-POOL-MIB
+CISCO-IP-ADDRESS-POOL-TC-MIB.my                CISCO-IP-ADDRESS-POOL-TC-MIB
+CISCO-IP-CAPABILITY.my                 CISCO-IP-CAPABILITY
+CISCO-IP-CBR-METRICS-MIB.my            CISCO-IP-CBR-METRICS-MIB
+CISCO-IP-ENCRYPTION-MIB.my             CISCO-IP-ENCRYPTION-MIB
+CISCO-IP-FORWARD-CAPABILITY.my         CISCO-IP-FORWARD-CAPABILITY
+CISCO-IP-IF-CAPABILITY.my              CISCO-IP-IF-CAPABILITY
+CISCO-IP-IF-MIB.my                     CISCO-IP-IF-MIB
+CISCO-IP-LOCAL-POOL-MIB.my             CISCO-IP-LOCAL-POOL-MIB
+CISCO-IP-NW-DISCOVERY-CAPABILITY.my    CISCO-IP-NW-DISCOVERY-CAPABILITY
+CISCO-IP-NW-DISCOVERY-MIB.my           CISCO-IP-NW-DISCOVERY-MIB
+CISCO-IP-PROTOCOL-FILTER-CAPABILITY.my CISCO-IP-PROTOCOL-FILTER-CAPABILITY
+CISCO-IP-PROTOCOL-FILTER-MIB.my                CISCO-IP-PROTOCOL-FILTER-MIB
+CISCO-IP-RAN-BACKHAUL-CAPABILITY.my    CISCO-IP-RAN-BACKHAUL-CAPABILITY
+CISCO-IP-RAN-BACKHAUL-MIB.my           CISCO-IP-RAN-BACKHAUL-MIB
+CISCO-IP-STAT-MIB.my                   CISCO-IP-STAT-MIB
+CISCO-IP-UPLINK-REDIRECT-MIB.my                CISCO-IP-UPLINK-REDIRECT-MIB
+CISCO-IP-URPF-MIB.my                   CISCO-IP-URPF-MIB
+CISCO-IPMCAST-MIB.my                   CISCO-IPMCAST-MIB
+CISCO-IPMROUTE-MIB.my                  CISCO-IPMROUTE-MIB
+CISCO-IPSEC-FLOW-MONITOR-MIB.my                CISCO-IPSEC-FLOW-MONITOR-MIB
+CISCO-IPSEC-MIB.my                     CISCO-IPSEC-MIB
+CISCO-IPSEC-POLICY-MAP-MIB.my          CISCO-IPSEC-POLICY-MAP-MIB
+CISCO-IPSEC-PROV-CAPABILITY.my         CISCO-IPSEC-PROV-CAPABILITY
+CISCO-IPSEC-PROVISIONING-MIB.my                CISCO-IPSEC-PROVISIONING-MIB
+CISCO-IPSEC-SIGNALING-CAPABILITY.my    CISCO-IPSEC-SIGNALING-CAPABILITY
+CISCO-IPSEC-SIGNALING-MIB.my           CISCO-IPSEC-SIGNALING-MIB
+CISCO-IPSEC-TC.my                      CISCO-IPSEC-TC
+CISCO-IPSLA-AUTOMEASURE-MIB.my         CISCO-IPSLA-AUTOMEASURE-MIB
+CISCO-IPSLA-ECHO-MIB.my                        CISCO-IPSLA-ECHO-MIB
+CISCO-IPSLA-ETHERNET-CAPABILITY.my     CISCO-IPSLA-ETHERNET-CAPABILITY
+CISCO-IPSLA-ETHERNET-MIB.my            CISCO-IPSLA-ETHERNET-MIB
+CISCO-IPSLA-JITTER-MIB.my              CISCO-IPSLA-JITTER-MIB
+CISCO-IPSLA-TC-MIB.my                  CISCO-IPSLA-TC-MIB
+CISCO-IPSLA-VIDEO-MIB.my               CISCO-IPSLA-VIDEO-MIB
+CISCO-IPSLA-VIDEO-PROFILE-CAPABILITY.my        CISCO-IPSLA-VIDEO-PROFILE-CAPABILITY
+CISCO-IPSLA-VIDEO-PROFILE-MIB.my       CISCO-IPSLA-VIDEO-PROFILE-MIB
+CISCO-IPV6-CAPABILITY.my               CISCO-IPV6-CAPABILITY
+CISCO-IPV6-MLD-CAPABILITY.my           CISCO-IPV6-MLD-CAPABILITY
+CISCO-ISCSI-GW-MIB.my                  CISCO-ISCSI-GW-MIB
+CISCO-ISCSI-MIB.my                     CISCO-ISCSI-MIB
+CISCO-ISDN-MIB.my                      CISCO-ISDN-MIB
+CISCO-ISDNU-IF-MIB.my                  CISCO-ISDNU-IF-MIB
+CISCO-ISNS-CLIENT-MIB.my               CISCO-ISNS-CLIENT-MIB
+CISCO-ITP-ACL-CAPABILITY.my            CISCO-ITP-ACL-CAPABILITY
+CISCO-ITP-ACL-MIB.my                   CISCO-ITP-ACL-MIB
+CISCO-ITP-ACT-CAPABILITY.my            CISCO-ITP-ACT-CAPABILITY
+CISCO-ITP-ACT-MIB.my                   CISCO-ITP-ACT-MIB
+CISCO-ITP-DSMR-MIB.my                  CISCO-ITP-DSMR-MIB
+CISCO-ITP-DSMR-SMPP-MIB.my             CISCO-ITP-DSMR-SMPP-MIB
+CISCO-ITP-DSMR-UCP-MIB.my              CISCO-ITP-DSMR-UCP-MIB
+CISCO-ITP-GACT-CAPABILITY.my           CISCO-ITP-GACT-CAPABILITY
+CISCO-ITP-GACT-MIB.my                  CISCO-ITP-GACT-MIB
+CISCO-ITP-GRT-CAPABILITY.my            CISCO-ITP-GRT-CAPABILITY
+CISCO-ITP-GRT-MIB.my                   CISCO-ITP-GRT-MIB
+CISCO-ITP-GSCCP-CAPABILITY.my          CISCO-ITP-GSCCP-CAPABILITY
+CISCO-ITP-GSCCP-MIB.my                 CISCO-ITP-GSCCP-MIB
+CISCO-ITP-GSP-CAPABILITY.my            CISCO-ITP-GSP-CAPABILITY
+CISCO-ITP-GSP-MIB.my                   CISCO-ITP-GSP-MIB
+CISCO-ITP-GSP2-CAPABILITY.my           CISCO-ITP-GSP2-CAPABILITY
+CISCO-ITP-GSP2-MIB.my                  CISCO-ITP-GSP2-MIB
+CISCO-ITP-GTCAP-MIB.my                 CISCO-ITP-GTCAP-MIB
+CISCO-ITP-MLR-CAPABILITY.my            CISCO-ITP-MLR-CAPABILITY
+CISCO-ITP-MLR-MIB.my                   CISCO-ITP-MLR-MIB
+CISCO-ITP-MONITOR-CAPABILITY.my                CISCO-ITP-MONITOR-CAPABILITY
+CISCO-ITP-MONITOR-MIB.my               CISCO-ITP-MONITOR-MIB
+CISCO-ITP-MSU-RATES-CAPABILITY.my      CISCO-ITP-MSU-RATES-CAPABILITY
+CISCO-ITP-MSU-RATES-MIB.my             CISCO-ITP-MSU-RATES-MIB
+CISCO-ITP-RT-CAPABILITY.my             CISCO-ITP-RT-CAPABILITY
+CISCO-ITP-RT-MIB.my                    CISCO-ITP-RT-MIB
+CISCO-ITP-SCCP-CAPABILITY.my           CISCO-ITP-SCCP-CAPABILITY
+CISCO-ITP-SCCP-MIB.my                  CISCO-ITP-SCCP-MIB
+CISCO-ITP-SP-CAPABILITY.my             CISCO-ITP-SP-CAPABILITY
+CISCO-ITP-SP-MIB.my                    CISCO-ITP-SP-MIB
+CISCO-ITP-SP2-CAPABILITY.my            CISCO-ITP-SP2-CAPABILITY
+CISCO-ITP-SP2-MIB.my                   CISCO-ITP-SP2-MIB
+CISCO-ITP-TC-MIB.my                    CISCO-ITP-TC-MIB
+CISCO-ITP-XUA-CAPABILITY.my            CISCO-ITP-XUA-CAPABILITY
+CISCO-ITP-XUA-MIB.my                   CISCO-ITP-XUA-MIB
+CISCO-IVR-CAPABILITY.my                        CISCO-IVR-CAPABILITY
+CISCO-IVR-MIB.my                       CISCO-IVR-MIB
+CISCO-JOB-MONITORING-CAPABILITY.my     CISCO-JOB-MONITORING-CAPABILITY
+CISCO-L2-CONTROL-CAPABILITY.my         CISCO-L2-CONTROL-CAPABILITY
+CISCO-L2-CONTROL-MIB.my                        CISCO-L2-CONTROL-MIB
+CISCO-L2-DEV-MONITORING-MIB.my         CISCO-L2-DEV-MONITORING-MIB
+CISCO-L2-TUNNEL-CONFIG-CAPABILITY.my   CISCO-L2-TUNNEL-CONFIG-CAPABILITY
+CISCO-L2-TUNNEL-CONFIG-MIB.my          CISCO-L2-TUNNEL-CONFIG-MIB
+CISCO-L2L3-INTERFACE-CONFIG-CAPABILITY.my      CISCO-L2L3-INTERFACE-CONFIG-CAPABILITY
+CISCO-L2L3-INTERFACE-CONFIG-MIB.my     CISCO-L2L3-INTERFACE-CONFIG-MIB
+CISCO-L2NAT-MIB.my                     CISCO-L2NAT-MIB
+CISCO-L4L7MODULE-REDUNDANCY-CAPABILITY.my      CISCO-L4L7MODULE-REDUNDANCY-CAPABILITY
+CISCO-L4L7MODULE-REDUNDANCY-MIB.my     CISCO-L4L7MODULE-REDUNDANCY-MIB
+CISCO-L4L7MODULE-RESOURCE-LIMIT-CAPABILITY.my  CISCO-L4L7MODULE-RESOURCE-LIMIT-CAPABILITY
+CISCO-L4L7MODULE-RESOURCE-LIMIT-MIB.my CISCO-L4L7MODULE-RESOURCE-LIMIT-MIB
+CISCO-LAG-CAPABILITY.my                        CISCO-LAG-CAPABILITY
+CISCO-LAG-MIB.my                       CISCO-LAG-MIB
+CISCO-LATITUDE-MIB.my                  CISCO-LATITUDE-MIB
+CISCO-LEC-DATA-VCC-MIB.my              CISCO-LEC-DATA-VCC-MIB
+CISCO-LEC-EXT-MIB.my                   CISCO-LEC-EXT-MIB
+CISCO-LECS-MIB.my                      CISCO-LECS-MIB
+CISCO-LES-MIB.my                       CISCO-LES-MIB
+CISCO-LICENSE-MGMT-MIB.my              CISCO-LICENSE-MGMT-MIB
+CISCO-LICENSE-MGR-CAPABILITY.my                CISCO-LICENSE-MGR-CAPABILITY
+CISCO-LICENSE-MGR-MIB.my               CISCO-LICENSE-MGR-MIB
+CISCO-LICENSE-MIB.my                   CISCO-LICENSE-MIB
+CISCO-LINK-ERROR-MONITOR-CAPABILITY.my CISCO-LINK-ERROR-MONITOR-CAPABILITY
+CISCO-LINK-ERROR-MONITOR-MIB.my                CISCO-LINK-ERROR-MONITOR-MIB
+CISCO-LISP-EXT-MIB.my                  CISCO-LISP-EXT-MIB
+CISCO-LIVEDATA-MIB.my                  CISCO-LIVEDATA-MIB
+CISCO-LLDP-EXT-MED-CAPABILITY.my       CISCO-LLDP-EXT-MED-CAPABILITY
+CISCO-LOCAL-AUTH-USER-MIB.my           CISCO-LOCAL-AUTH-USER-MIB
+CISCO-LOCAL-DIRECTOR-MIB.my            CISCO-LOCAL-DIRECTOR-MIB
+CISCO-LPTS-MIB.my                      CISCO-LPTS-MIB
+CISCO-LRE-CPE-MIB.my                   CISCO-LRE-CPE-MIB
+CISCO-LWAPP-AAA-MIB.my                 CISCO-LWAPP-AAA-MIB
+CISCO-LWAPP-ACL-MIB.my                 CISCO-LWAPP-ACL-MIB
+CISCO-LWAPP-AP-MIB.my                  CISCO-LWAPP-AP-MIB
+CISCO-LWAPP-CCX-RM-MIB.my              CISCO-LWAPP-CCX-RM-MIB
+CISCO-LWAPP-CDP-MIB.my                 CISCO-LWAPP-CDP-MIB
+CISCO-LWAPP-CLIENT-ROAMING-CAPABILITY.my       CISCO-LWAPP-CLIENT-ROAMING-CAPABILITY
+CISCO-LWAPP-CLIENT-ROAMING-MIB.my      CISCO-LWAPP-CLIENT-ROAMING-MIB
+CISCO-LWAPP-DOT11-CLIENT-CALIB-CAPABILITY.my   CISCO-LWAPP-DOT11-CLIENT-CALIB-CAPABILITY
+CISCO-LWAPP-DOT11-CLIENT-CALIB-MIB.my  CISCO-LWAPP-DOT11-CLIENT-CALIB-MIB
+CISCO-LWAPP-DOT11-CLIENT-CCX-REPORTS-MIB.my    CISCO-LWAPP-DOT11-CLIENT-CCX-REPORTS-MIB
+CISCO-LWAPP-DOT11-CLIENT-CCX-TC-MIB.my CISCO-LWAPP-DOT11-CLIENT-CCX-TC-MIB
+CISCO-LWAPP-DOT11-CLIENT-MIB.my                CISCO-LWAPP-DOT11-CLIENT-MIB
+CISCO-LWAPP-DOT11-CLIENT-TS-MIB.my     CISCO-LWAPP-DOT11-CLIENT-TS-MIB
+CISCO-LWAPP-DOT11-LDAP-MIB.my          CISCO-LWAPP-DOT11-LDAP-MIB
+CISCO-LWAPP-DOT11-MIB.my               CISCO-LWAPP-DOT11-MIB
+CISCO-LWAPP-IDS-MIB.my                 CISCO-LWAPP-IDS-MIB
+CISCO-LWAPP-INTERFACE-MIB.my           CISCO-LWAPP-INTERFACE-MIB
+CISCO-LWAPP-LINKTEST-MIB.my            CISCO-LWAPP-LINKTEST-MIB
+CISCO-LWAPP-LOCAL-AUTH-MIB.my          CISCO-LWAPP-LOCAL-AUTH-MIB
+CISCO-LWAPP-MESH-BATTERY-MIB.my                CISCO-LWAPP-MESH-BATTERY-MIB
+CISCO-LWAPP-MESH-LINKTEST-MIB.my       CISCO-LWAPP-MESH-LINKTEST-MIB
+CISCO-LWAPP-MESH-MIB.my                        CISCO-LWAPP-MESH-MIB
+CISCO-LWAPP-MESH-STATS-MIB.my          CISCO-LWAPP-MESH-STATS-MIB
+CISCO-LWAPP-MFP-CAPABILITY.my          CISCO-LWAPP-MFP-CAPABILITY
+CISCO-LWAPP-MFP-MIB.my                 CISCO-LWAPP-MFP-MIB
+CISCO-LWAPP-MOBILITY-MIB.my            CISCO-LWAPP-MOBILITY-MIB
+CISCO-LWAPP-QOS-CAPABILITY.my          CISCO-LWAPP-QOS-CAPABILITY
+CISCO-LWAPP-QOS-MIB.my                 CISCO-LWAPP-QOS-MIB
+CISCO-LWAPP-REAP-MIB.my                        CISCO-LWAPP-REAP-MIB
+CISCO-LWAPP-ROGUE-MIB.my               CISCO-LWAPP-ROGUE-MIB
+CISCO-LWAPP-RRM-MIB.my                 CISCO-LWAPP-RRM-MIB
+CISCO-LWAPP-SI-MIB.my                  CISCO-LWAPP-SI-MIB
+CISCO-LWAPP-SYS-MIB.my                 CISCO-LWAPP-SYS-MIB
+CISCO-LWAPP-TC-MIB.my                  CISCO-LWAPP-TC-MIB
+CISCO-LWAPP-TSM-CAPABILITY.my          CISCO-LWAPP-TSM-CAPABILITY
+CISCO-LWAPP-TSM-MIB.my                 CISCO-LWAPP-TSM-MIB
+CISCO-LWAPP-WEBAUTH-MIB.my             CISCO-LWAPP-WEBAUTH-MIB
+CISCO-LWAPP-WLAN-MIB.my                        CISCO-LWAPP-WLAN-MIB
+CISCO-LWAPP-WLAN-SECURITY-MIB.my       CISCO-LWAPP-WLAN-SECURITY-MIB
+CISCO-MAC-AUTH-BYPASS-CAPABILITY.my    CISCO-MAC-AUTH-BYPASS-CAPABILITY
+CISCO-MAC-AUTH-BYPASS-MIB.my           CISCO-MAC-AUTH-BYPASS-MIB
+CISCO-MAC-NOTIFICATION-CAPABILITY.my   CISCO-MAC-NOTIFICATION-CAPABILITY
+CISCO-MAC-NOTIFICATION-MIB.my          CISCO-MAC-NOTIFICATION-MIB
+CISCO-MAU-CAPABILITY.my                        CISCO-MAU-CAPABILITY
+CISCO-MAU-EXT-CAPABILITY.my            CISCO-MAU-EXT-CAPABILITY
+CISCO-MAU-EXT-MIB.my                   CISCO-MAU-EXT-MIB
+CISCO-MDI-METRICS-MIB.my               CISCO-MDI-METRICS-MIB
+CISCO-MEDIA-GATEWAY-CAPABILITY.my      CISCO-MEDIA-GATEWAY-CAPABILITY
+CISCO-MEDIA-GATEWAY-MIB.my             CISCO-MEDIA-GATEWAY-MIB
+CISCO-MEDIA-METRICS-MIB.my             CISCO-MEDIA-METRICS-MIB
+CISCO-MEDIA-QUALITY-CAPABILITY.my      CISCO-MEDIA-QUALITY-CAPABILITY
+CISCO-MEDIA-QUALITY-MIB.my             CISCO-MEDIA-QUALITY-MIB
+CISCO-MEDIATRACE-MIB.my                        CISCO-MEDIATRACE-MIB
+CISCO-MEETINGPLACE-MIB.my              CISCO-MEETINGPLACE-MIB
+CISCO-MEGACO-EXT-CAPABILITY.my         CISCO-MEGACO-EXT-CAPABILITY
+CISCO-MEGACO-EXT-MIB.my                        CISCO-MEGACO-EXT-MIB
+CISCO-MEMORY-POOL-CAPABILITY.my                CISCO-MEMORY-POOL-CAPABILITY
+CISCO-MEMORY-POOL-MIB.my               CISCO-MEMORY-POOL-MIB
+CISCO-METRO-PHY-MIB.my                 CISCO-METRO-PHY-MIB
+CISCO-MGC-CAPABILITY.my                        CISCO-MGC-CAPABILITY
+CISCO-MGC-MIB.my                       CISCO-MGC-MIB
+CISCO-MGX82XX-ATM-UNI-PORT-MIB.my      CISCO-MGX82XX-ATM-UNI-PORT-MIB
+CISCO-MGX82XX-CARD-FEATURE-MIB.my      CISCO-MGX82XX-CARD-FEATURE-MIB
+CISCO-MGX82XX-DSX1-MIB.my              CISCO-MGX82XX-DSX1-MIB
+CISCO-MGX82XX-DSX3-BERT-MIB.my         CISCO-MGX82XX-DSX3-BERT-MIB
+CISCO-MGX82XX-DSX3-MIB.my              CISCO-MGX82XX-DSX3-MIB
+CISCO-MGX82XX-ENVMON-MIB.my            CISCO-MGX82XX-ENVMON-MIB
+CISCO-MGX82XX-MODULE-RSRC-PART-MIB.my  CISCO-MGX82XX-MODULE-RSRC-PART-MIB
+CISCO-MGX82XX-PXM-CLOCK-MIB.my         CISCO-MGX82XX-PXM-CLOCK-MIB
+CISCO-MGX82XX-RPM-CONN-MIB.my          CISCO-MGX82XX-RPM-CONN-MIB
+CISCO-MGX82XX-RPM-RSRC-PART-MIB.my     CISCO-MGX82XX-RPM-RSRC-PART-MIB
+CISCO-MGX82XX-RPM-SUBIF-MIB.my         CISCO-MGX82XX-RPM-SUBIF-MIB
+CISCO-MGX82XX-VIRTUAL-PORT-MIB.my      CISCO-MGX82XX-VIRTUAL-PORT-MIB
+CISCO-MGX8800-IF-MAPPING-CAPABILITY.my CISCO-MGX8800-IF-MAPPING-CAPABILITY
+CISCO-MGX8800-IF-MAPPING-MIB.my                CISCO-MGX8800-IF-MAPPING-MIB
+CISCO-MIP-CAPABILITY.my                        CISCO-MIP-CAPABILITY
+CISCO-MLD-SNOOPING-CAPABILITY.my       CISCO-MLD-SNOOPING-CAPABILITY
+CISCO-MLD-SNOOPING-MIB.my              CISCO-MLD-SNOOPING-MIB
+CISCO-MMAIL-DIAL-CONTROL-MIB.my                CISCO-MMAIL-DIAL-CONTROL-MIB
+CISCO-MMODAL-CONTACT-APPS-MIB.my       CISCO-MMODAL-CONTACT-APPS-MIB
+CISCO-MOBILE-IP-CAPABILITY.my          CISCO-MOBILE-IP-CAPABILITY
+CISCO-MOBILE-IP-MIB.my                 CISCO-MOBILE-IP-MIB
+CISCO-MOBILE-POLICY-CHARGING-CONTROL-MIB.my    CISCO-MOBILE-POLICY-CHARGING-CONTROL-MIB
+CISCO-MODEM-MGMT-CAPABILITY.my         CISCO-MODEM-MGMT-CAPABILITY
+CISCO-MODEM-MGMT-MIB.my                        CISCO-MODEM-MGMT-MIB
+CISCO-MODULE-AUTO-SHUTDOWN-CAPABILITY.my       CISCO-MODULE-AUTO-SHUTDOWN-CAPABILITY
+CISCO-MODULE-AUTO-SHUTDOWN-MIB.my      CISCO-MODULE-AUTO-SHUTDOWN-MIB
+CISCO-MODULE-VIRTUALIZATION-CAPABILITY.my      CISCO-MODULE-VIRTUALIZATION-CAPABILITY
+CISCO-MODULE-VIRTUALIZATION-MIB.my     CISCO-MODULE-VIRTUALIZATION-MIB
+CISCO-MPLS-LSR-EXT-STD-MIB.my          CISCO-MPLS-LSR-EXT-STD-MIB
+CISCO-MPLS-TC-EXT-STD-MIB.my           CISCO-MPLS-TC-EXT-STD-MIB
+CISCO-MPLS-TE-STD-EXT-MIB.my           CISCO-MPLS-TE-STD-EXT-MIB
+CISCO-MPOA-EXT-MIB.my                  CISCO-MPOA-EXT-MIB
+CISCO-MSP-MIB.my                       CISCO-MSP-MIB
+CISCO-MVPN-MIB.my                      CISCO-MVPN-MIB
+CISCO-NAC-NAD-CAPABILITY.my            CISCO-NAC-NAD-CAPABILITY
+CISCO-NAC-NAD-MIB.my                   CISCO-NAC-NAD-MIB
+CISCO-NAC-TC-MIB.my                    CISCO-NAC-TC-MIB
+CISCO-NAT-CGN-EXT-MIB.my               CISCO-NAT-CGN-EXT-MIB
+CISCO-NAT-EXT-MIB.my                   CISCO-NAT-EXT-MIB
+CISCO-NBAR-PROTOCOL-DISCOVERY-MIB.my   CISCO-NBAR-PROTOCOL-DISCOVERY-MIB
+CISCO-NDE-CAPABILITY.my                        CISCO-NDE-CAPABILITY
+CISCO-NDE-MIB.my                       CISCO-NDE-MIB
+CISCO-NETFLOW-CAPABILITY.my            CISCO-NETFLOW-CAPABILITY
+CISCO-NETFLOW-LITE-MIB.my              CISCO-NETFLOW-LITE-MIB
+CISCO-NETFLOW-MIB.my                   CISCO-NETFLOW-MIB
+CISCO-NETINT-CAPABILITY.my             CISCO-NETINT-CAPABILITY
+CISCO-NETINT-MIB.my                    CISCO-NETINT-MIB
+CISCO-NETSYNC-MIB.my                   CISCO-NETSYNC-MIB
+CISCO-NETWORK-REGISTRAR-MIB.my         CISCO-NETWORK-REGISTRAR-MIB
+CISCO-NETWORK-VIRTUALIZATION-OVERLAY-MIB.my    CISCO-NETWORK-VIRTUALIZATION-OVERLAY-MIB
+CISCO-NHRP-EXT-MIB.my                  CISCO-NHRP-EXT-MIB
+CISCO-NMS-APPL-HEALTH-MIB.my           CISCO-NMS-APPL-HEALTH-MIB
+CISCO-NOTIFICATION-CONTROL-MIB.my      CISCO-NOTIFICATION-CONTROL-MIB
+CISCO-NOTIFICATION-LOG-CAPABILITY.my   CISCO-NOTIFICATION-LOG-CAPABILITY
+CISCO-NPORT-VIRTUALIZATION-MIB.my      CISCO-NPORT-VIRTUALIZATION-MIB
+CISCO-NS-MIB.my                                CISCO-NS-MIB
+CISCO-NTP-CAPABILITY.my                        CISCO-NTP-CAPABILITY
+CISCO-NTP-MIB.my                       CISCO-NTP-MIB
+CISCO-OAM-MIB.my                       CISCO-OAM-MIB
+CISCO-OBMI-MIB.my                      CISCO-OBMI-MIB
+CISCO-OPTICAL-IF-CROSS-CONNECT-MIB.my  CISCO-OPTICAL-IF-CROSS-CONNECT-MIB
+CISCO-OPTICAL-IF-EXTN-MIB.my           CISCO-OPTICAL-IF-EXTN-MIB
+CISCO-OPTICAL-MIB.my                   CISCO-OPTICAL-MIB
+CISCO-OPTICAL-MONITOR-CAPABILITY.my    CISCO-OPTICAL-MONITOR-CAPABILITY
+CISCO-OPTICAL-MONITOR-MIB.my           CISCO-OPTICAL-MONITOR-MIB
+CISCO-OPTICAL-MONITORING-MIB.my                CISCO-OPTICAL-MONITORING-MIB
+CISCO-OPTICAL-PATCH-MIB.my             CISCO-OPTICAL-PATCH-MIB
+CISCO-OSCP-MIB.my                      CISCO-OSCP-MIB
+CISCO-OSPF-CAPABILITY.my               CISCO-OSPF-CAPABILITY
+CISCO-OSPF-MIB.my                      CISCO-OSPF-MIB
+CISCO-OSPF-TRAP-CAPABILITY.my          CISCO-OSPF-TRAP-CAPABILITY
+CISCO-OSPF-TRAP-MIB.my                 CISCO-OSPF-TRAP-MIB
+CISCO-OTN-IF-CAPABILITY.my             CISCO-OTN-IF-CAPABILITY
+CISCO-OTN-IF-MIB.my                    CISCO-OTN-IF-MIB
+CISCO-OTV-CAPABILITY.my                        CISCO-OTV-CAPABILITY
+CISCO-OTV-MIB.my                       CISCO-OTV-MIB
+CISCO-OUTAGE-MONITOR-MIB.my            CISCO-OUTAGE-MONITOR-MIB
+CISCO-P-BRIDGE-CAPABILITY.my           CISCO-P-BRIDGE-CAPABILITY
+CISCO-P2P-IF-MIB.my                    CISCO-P2P-IF-MIB
+CISCO-PACKET-CAPTURE-CAPABILITY.my     CISCO-PACKET-CAPTURE-CAPABILITY
+CISCO-PACKET-CAPTURE-MIB.my            CISCO-PACKET-CAPTURE-MIB
+CISCO-PAE-CAPABILITY.my                        CISCO-PAE-CAPABILITY
+CISCO-PAE-MIB.my                       CISCO-PAE-MIB
+CISCO-PAGP-CAPABILITY.my               CISCO-PAGP-CAPABILITY
+CISCO-PAGP-MIB.my                      CISCO-PAGP-MIB
+CISCO-PFC-EXT-CAPABILITY.my            CISCO-PFC-EXT-CAPABILITY
+CISCO-PFC-EXT-MIB.my                   CISCO-PFC-EXT-MIB
+CISCO-PFR-MIB.my                       CISCO-PFR-MIB
+CISCO-PIM-MIB.my                       CISCO-PIM-MIB
+CISCO-PING-CAPABILITY.my               CISCO-PING-CAPABILITY
+CISCO-PING-MIB.my                      CISCO-PING-MIB
+CISCO-PKI-PARTICIPATION-MIB.my         CISCO-PKI-PARTICIPATION-MIB
+CISCO-PMON-MIB.my                      CISCO-PMON-MIB
+CISCO-PNNI-CAPABILITY.my               CISCO-PNNI-CAPABILITY
+CISCO-PNNI-MIB.my                      CISCO-PNNI-MIB
+CISCO-POE-PD-MIB.my                    CISCO-POE-PD-MIB
+CISCO-POLICY-GROUP-CAPABILITY.my       CISCO-POLICY-GROUP-CAPABILITY
+CISCO-POLICY-GROUP-MIB.my              CISCO-POLICY-GROUP-MIB
+CISCO-POP-MGMT-CAPABILITY.my           CISCO-POP-MGMT-CAPABILITY
+CISCO-POP-MGMT-MIB.my                  CISCO-POP-MGMT-MIB
+CISCO-PORT-CHANNEL-MIB.my              CISCO-PORT-CHANNEL-MIB
+CISCO-PORT-QOS-CAPABILITY.my           CISCO-PORT-QOS-CAPABILITY
+CISCO-PORT-QOS-MIB.my                  CISCO-PORT-QOS-MIB
+CISCO-PORT-SECURITY-CAPABILITY.my      CISCO-PORT-SECURITY-CAPABILITY
+CISCO-PORT-SECURITY-MIB.my             CISCO-PORT-SECURITY-MIB
+CISCO-PORT-STORM-CONTROL-CAPABILITY.my CISCO-PORT-STORM-CONTROL-CAPABILITY
+CISCO-PORT-STORM-CONTROL-MIB.my                CISCO-PORT-STORM-CONTROL-MIB
+CISCO-PORT-TRACK-MIB.my                        CISCO-PORT-TRACK-MIB
+CISCO-POWER-ETHERNET-CAPABILITY.my     CISCO-POWER-ETHERNET-CAPABILITY
+CISCO-POWER-ETHERNET-EXT-CAPABILITY.my CISCO-POWER-ETHERNET-EXT-CAPABILITY
+CISCO-POWER-ETHERNET-EXT-MIB.my                CISCO-POWER-ETHERNET-EXT-MIB
+CISCO-PPPOE-MIB.my                     CISCO-PPPOE-MIB
+CISCO-PREFERRED-PATH-MIB.my            CISCO-PREFERRED-PATH-MIB
+CISCO-PRINTER-CAPABILITY.my            CISCO-PRINTER-CAPABILITY
+CISCO-PRIVATE-VLAN-CAPABILITY.my       CISCO-PRIVATE-VLAN-CAPABILITY
+CISCO-PRIVATE-VLAN-MIB.my              CISCO-PRIVATE-VLAN-MIB
+CISCO-PROCESS-CAPABILITY.my            CISCO-PROCESS-CAPABILITY
+CISCO-PROCESS-MIB.my                   CISCO-PROCESS-MIB
+CISCO-PRODUCTS-MIB.my                  CISCO-PRODUCTS-MIB
+CISCO-PROP-ATM-IF-MIB.my               CISCO-PROP-ATM-IF-MIB
+CISCO-PROXY-CONTROL-MIB.my             CISCO-PROXY-CONTROL-MIB
+CISCO-PSA-MICROCODE-MIB.my             CISCO-PSA-MICROCODE-MIB
+CISCO-PSD-CLIENT-MIB.my                        CISCO-PSD-CLIENT-MIB
+CISCO-PSM-MIB-CAPABILITY.my            CISCO-PSM-MIB-CAPABILITY
+CISCO-PSM-MIB.my                       CISCO-PSM-MIB
+CISCO-PTOPO-EXTN-MIB.my                        CISCO-PTOPO-EXTN-MIB
+CISCO-PTP-MIB.my                       CISCO-PTP-MIB
+CISCO-Q-BRIDGE-CAPABILITY.my           CISCO-Q-BRIDGE-CAPABILITY
+CISCO-QINQ-VLAN-MIB.my                 CISCO-QINQ-VLAN-MIB
+CISCO-QLLC01-MIB.my                    CISCO-QLLC01-MIB
+CISCO-QOS-PIB-CAPABILITY.my            CISCO-QOS-PIB-CAPABILITY
+CISCO-QOS-PIB-MIB.my                   CISCO-QOS-PIB-MIB
+CISCO-QOS-POLICY-CONFIG-CAPABILITY.my  CISCO-QOS-POLICY-CONFIG-CAPABILITY
+CISCO-QOS-POLICY-CONFIG-MIB.my         CISCO-QOS-POLICY-CONFIG-MIB
+CISCO-QOS-TC-MIB.my                    CISCO-QOS-TC-MIB
+CISCO-QP-LBG-MIB.my                    CISCO-QP-LBG-MIB
+CISCO-QUEUE-MIB.my                     CISCO-QUEUE-MIB
+CISCO-RADIUS-ACC-CLIENT-CAPABILITY.my  CISCO-RADIUS-ACC-CLIENT-CAPABILITY
+CISCO-RADIUS-AUTH-CLIENT-CAPABILITY.my CISCO-RADIUS-AUTH-CLIENT-CAPABILITY
+CISCO-RADIUS-CAPABILITY.my             CISCO-RADIUS-CAPABILITY
+CISCO-RADIUS-EXT-MIB.my                        CISCO-RADIUS-EXT-MIB
+CISCO-RADIUS-MIB.my                    CISCO-RADIUS-MIB
+CISCO-REMOTE-ACCESS-MONITOR-MIB.my     CISCO-REMOTE-ACCESS-MONITOR-MIB
+CISCO-REPEATER-MIB.my                  CISCO-REPEATER-MIB
+CISCO-REPORT-INTERVAL-TC-MIB.my                CISCO-REPORT-INTERVAL-TC-MIB
+CISCO-RESILIENT-ETHERNET-PROTOCOL-MIB.my       CISCO-RESILIENT-ETHERNET-PROTOCOL-MIB
+CISCO-RF-CAPABILITY.my                 CISCO-RF-CAPABILITY
+CISCO-RF-MIB.my                                CISCO-RF-MIB
+CISCO-RF-SUPPLEMENTAL-MIB.my           CISCO-RF-SUPPLEMENTAL-MIB
+CISCO-RFC1213-CAPABILITY.my            CISCO-RFC1213-CAPABILITY
+CISCO-RFC1406-CAPABILITY.my            CISCO-RFC1406-CAPABILITY
+CISCO-RFC1407-CAPABILITY.my            CISCO-RFC1407-CAPABILITY
+CISCO-RHINO-MIB.my                     CISCO-RHINO-MIB
+CISCO-RMON-CAPABILITY.my               CISCO-RMON-CAPABILITY
+CISCO-RMON-CONFIG-CAPABILITY.my                CISCO-RMON-CONFIG-CAPABILITY
+CISCO-RMON-CONFIG-MIB.my               CISCO-RMON-CONFIG-MIB
+CISCO-RMON2-CAPABILITY.my              CISCO-RMON2-CAPABILITY
+CISCO-ROUTE-POLICIES-MIB.my            CISCO-ROUTE-POLICIES-MIB
+CISCO-RPMS-MIB.my                      CISCO-RPMS-MIB
+CISCO-RS-232-CAPABILITY.my             CISCO-RS-232-CAPABILITY
+CISCO-RSCN-MIB.my                      CISCO-RSCN-MIB
+CISCO-RSRB-MIB.my                      CISCO-RSRB-MIB
+CISCO-RTP-METRICS-MIB.my               CISCO-RTP-METRICS-MIB
+CISCO-RTTMON-CAPABILITY.my             CISCO-RTTMON-CAPABILITY
+CISCO-RTTMON-ICMP-MIB.my               CISCO-RTTMON-ICMP-MIB
+CISCO-RTTMON-IP-EXT-MIB.my             CISCO-RTTMON-IP-EXT-MIB
+CISCO-RTTMON-MIB.my                    CISCO-RTTMON-MIB
+CISCO-RTTMON-RTP-MIB.my                        CISCO-RTTMON-RTP-MIB
+CISCO-RTTMON-TC-MIB.my                 CISCO-RTTMON-TC-MIB
+CISCO-SAA-APM-MIB.my                   CISCO-SAA-APM-MIB
+CISCO-SAN-BASE-SVC-MIB.my              CISCO-SAN-BASE-SVC-MIB
+CISCO-SANTAP-MIB.my                    CISCO-SANTAP-MIB
+CISCO-SCSI-FLOW-MIB.my                 CISCO-SCSI-FLOW-MIB
+CISCO-SCSI-MIB.my                      CISCO-SCSI-MIB
+CISCO-SCTP-CAPABILITY.my               CISCO-SCTP-CAPABILITY
+CISCO-SCTP-MIB.my                      CISCO-SCTP-MIB
+CISCO-SDLLC-MIB.my                     CISCO-SDLLC-MIB
+CISCO-SDSL-LINE-MIB.my                 CISCO-SDSL-LINE-MIB
+CISCO-SECURE-SHELL-CAPABILITY.my       CISCO-SECURE-SHELL-CAPABILITY
+CISCO-SECURE-SHELL-MIB.my              CISCO-SECURE-SHELL-MIB
+CISCO-SELECTIVE-VRF-DOWNLOAD-MIB.my    CISCO-SELECTIVE-VRF-DOWNLOAD-MIB
+CISCO-SERVICE-CONTROL-ATTACK-MIB.my    CISCO-SERVICE-CONTROL-ATTACK-MIB
+CISCO-SERVICE-CONTROL-LINK-MIB.my      CISCO-SERVICE-CONTROL-LINK-MIB
+CISCO-SERVICE-CONTROL-RDR-MIB.my       CISCO-SERVICE-CONTROL-RDR-MIB
+CISCO-SERVICE-CONTROL-SUBSCRIBERS-MIB.my       CISCO-SERVICE-CONTROL-SUBSCRIBERS-MIB
+CISCO-SERVICE-CONTROL-TP-STATS-MIB.my  CISCO-SERVICE-CONTROL-TP-STATS-MIB
+CISCO-SERVICE-CONTROLLER-MIB.my                CISCO-SERVICE-CONTROLLER-MIB
+CISCO-SESS-BORDER-CTRLR-CALL-STATS-MIB.my      CISCO-SESS-BORDER-CTRLR-CALL-STATS-MIB
+CISCO-SESS-BORDER-CTRLR-EVENT-MIB.my   CISCO-SESS-BORDER-CTRLR-EVENT-MIB
+CISCO-SESS-BORDER-CTRLR-STATS-MIB.my   CISCO-SESS-BORDER-CTRLR-STATS-MIB
+CISCO-SEU-MITIGATION-MIB.my            CISCO-SEU-MITIGATION-MIB
+CISCO-SIBU-FLASH-MIB.my                        CISCO-SIBU-FLASH-MIB
+CISCO-SIBU-MANAGERS-MIB.my             CISCO-SIBU-MANAGERS-MIB
+CISCO-SIBU-STACKABLE-DUAL-SPEED-HUB-MIB.my     CISCO-SIBU-STACKABLE-DUAL-SPEED-HUB-MIB
+CISCO-SIP-CALLS-MIB.my                 CISCO-SIP-CALLS-MIB
+CISCO-SIP-UA-CAPABILITY.my             CISCO-SIP-UA-CAPABILITY
+CISCO-SIP-UA-MIB.my                    CISCO-SIP-UA-MIB
+CISCO-SLB-CAPABILITY.my                        CISCO-SLB-CAPABILITY
+CISCO-SLB-DFP-MIB.my                   CISCO-SLB-DFP-MIB
+CISCO-SLB-EXT-CAPABILITY.my            CISCO-SLB-EXT-CAPABILITY
+CISCO-SLB-EXT-MIB.my                   CISCO-SLB-EXT-MIB
+CISCO-SLB-HEALTH-MON-CAPABILITY.my     CISCO-SLB-HEALTH-MON-CAPABILITY
+CISCO-SLB-HEALTH-MON-MIB.my            CISCO-SLB-HEALTH-MON-MIB
+CISCO-SLB-MIB.my                       CISCO-SLB-MIB
+CISCO-SM-FILE-DOWNLOAD-MIB.my          CISCO-SM-FILE-DOWNLOAD-MIB
+CISCO-SMART-INSTALL-MIB.my             CISCO-SMART-INSTALL-MIB
+CISCO-SMART-LIC-MIB.my                 CISCO-SMART-LIC-MIB
+CISCO-SME-MIB.my                       CISCO-SME-MIB
+CISCO-SMI.my                           CISCO-SMI
+CISCO-SMON-CAPABILITY.my               CISCO-SMON-CAPABILITY
+CISCO-SNA-LLC-MIB.my                   CISCO-SNA-LLC-MIB
+CISCO-SNAPSHOT-MIB.my                  CISCO-SNAPSHOT-MIB
+CISCO-SNMP-COMMUNITY-CAPABILITY.my     CISCO-SNMP-COMMUNITY-CAPABILITY
+CISCO-SNMP-FRAMEWORK-CAPABILITY.my     CISCO-SNMP-FRAMEWORK-CAPABILITY
+CISCO-SNMP-MPD-CAPABILITY.my           CISCO-SNMP-MPD-CAPABILITY
+CISCO-SNMP-NOTIFICATION-CAPABILITY.my  CISCO-SNMP-NOTIFICATION-CAPABILITY
+CISCO-SNMP-NOTIFICATION-EXT-MIB.my     CISCO-SNMP-NOTIFICATION-EXT-MIB
+CISCO-SNMP-TARGET-CAPABILITY.my                CISCO-SNMP-TARGET-CAPABILITY
+CISCO-SNMP-TARGET-EXT-MIB.my           CISCO-SNMP-TARGET-EXT-MIB
+CISCO-SNMP-USM-CAPABILITY.my           CISCO-SNMP-USM-CAPABILITY
+CISCO-SNMP-USM-OIDS-MIB.my             CISCO-SNMP-USM-OIDS-MIB
+CISCO-SNMP-VACM-CAPABILITY.my          CISCO-SNMP-VACM-CAPABILITY
+CISCO-SNMP-VACM-EXT-MIB.my             CISCO-SNMP-VACM-EXT-MIB
+CISCO-SNMPv2-CAPABILITY.my             CISCO-SNMPv2-CAPABILITY
+CISCO-SONET-CAPABILITY.my              CISCO-SONET-CAPABILITY
+CISCO-SONET-EXT-CAPABILITY.my          CISCO-SONET-EXT-CAPABILITY
+CISCO-SONET-MIB.my                     CISCO-SONET-MIB
+CISCO-SP-CAPABILITY.my                 CISCO-SP-CAPABILITY
+CISCO-SP-MIB.my                                CISCO-SP-MIB
+CISCO-SRP-CAPABILITY.my                        CISCO-SRP-CAPABILITY
+CISCO-SRP-MIB.my                       CISCO-SRP-MIB
+CISCO-SRST-MIB.my                      CISCO-SRST-MIB
+CISCO-SSG-CAPABILITY.my                        CISCO-SSG-CAPABILITY
+CISCO-SSG-MIB.my                       CISCO-SSG-MIB
+CISCO-SSL-PROXY-CAPABILITY.my          CISCO-SSL-PROXY-CAPABILITY
+CISCO-SSL-PROXY-MIB.my                 CISCO-SSL-PROXY-MIB
+CISCO-SSLVPN-MIB.my                    CISCO-SSLVPN-MIB
+CISCO-SSM-PROV-MIB.my                  CISCO-SSM-PROV-MIB
+CISCO-ST-TC.my                         CISCO-ST-TC
+CISCO-STACK-CAPABILITY.my              CISCO-STACK-CAPABILITY
+CISCO-STACK-MIB.my                     CISCO-STACK-MIB
+CISCO-STACKMAKER-MIB.my                        CISCO-STACKMAKER-MIB
+CISCO-STACKWISE-MIB.my                 CISCO-STACKWISE-MIB
+CISCO-STP-EXTENSIONS-CAPABILITY.my     CISCO-STP-EXTENSIONS-CAPABILITY
+CISCO-STP-EXTENSIONS-MIB.my            CISCO-STP-EXTENSIONS-MIB
+CISCO-STUN-MIB.my                      CISCO-STUN-MIB
+CISCO-SUBSCRIBER-IDENTITY-TC-MIB.my    CISCO-SUBSCRIBER-IDENTITY-TC-MIB
+CISCO-SUBSCRIBER-SESSION-MIB.my                CISCO-SUBSCRIBER-SESSION-MIB
+CISCO-SUBSCRIBER-SESSION-TC-MIB.my     CISCO-SUBSCRIBER-SESSION-TC-MIB
+CISCO-SVC-INTERFACE-MIB.my             CISCO-SVC-INTERFACE-MIB
+CISCO-SVI-AUTOSTATE-CAPABILITY.my      CISCO-SVI-AUTOSTATE-CAPABILITY
+CISCO-SVI-AUTOSTATE-MIB.my             CISCO-SVI-AUTOSTATE-MIB
+CISCO-SWITCH-CEF-CAPABILITY.my         CISCO-SWITCH-CEF-CAPABILITY
+CISCO-SWITCH-CEF-MIB.my                        CISCO-SWITCH-CEF-MIB
+CISCO-SWITCH-CGMP-MIB.my               CISCO-SWITCH-CGMP-MIB
+CISCO-SWITCH-ENGINE-CAPABILITY.my      CISCO-SWITCH-ENGINE-CAPABILITY
+CISCO-SWITCH-ENGINE-MIB.my             CISCO-SWITCH-ENGINE-MIB
+CISCO-SWITCH-FABRIC-CAPABILITY.my      CISCO-SWITCH-FABRIC-CAPABILITY
+CISCO-SWITCH-FABRIC-MIB.my             CISCO-SWITCH-FABRIC-MIB
+CISCO-SWITCH-HARDWARE-CAPACITY-CAPABILITY.my   CISCO-SWITCH-HARDWARE-CAPACITY-CAPABILITY
+CISCO-SWITCH-HARDWARE-CAPACITY-MIB.my  CISCO-SWITCH-HARDWARE-CAPACITY-MIB
+CISCO-SWITCH-MULTICAST-CAPABILITY.my   CISCO-SWITCH-MULTICAST-CAPABILITY
+CISCO-SWITCH-MULTICAST-MIB.my          CISCO-SWITCH-MULTICAST-MIB
+CISCO-SWITCH-NETFLOW-CAPABILITY.my     CISCO-SWITCH-NETFLOW-CAPABILITY
+CISCO-SWITCH-NETFLOW-MIB.my            CISCO-SWITCH-NETFLOW-MIB
+CISCO-SWITCH-QOS-CAPABILITY.my         CISCO-SWITCH-QOS-CAPABILITY
+CISCO-SWITCH-QOS-MIB.my                        CISCO-SWITCH-QOS-MIB
+CISCO-SWITCH-RATE-LIMITER-CAPABILITY.my        CISCO-SWITCH-RATE-LIMITER-CAPABILITY
+CISCO-SWITCH-RATE-LIMITER-MIB.my       CISCO-SWITCH-RATE-LIMITER-MIB
+CISCO-SWITCH-STATS-CAPABILITY.my       CISCO-SWITCH-STATS-CAPABILITY
+CISCO-SWITCH-STATS-MIB.my              CISCO-SWITCH-STATS-MIB
+CISCO-SWITCH-USAGE-MIB.my              CISCO-SWITCH-USAGE-MIB
+CISCO-SYS-INFO-LOG-CAPABILITY.my       CISCO-SYS-INFO-LOG-CAPABILITY
+CISCO-SYS-INFO-LOG-MIB.my              CISCO-SYS-INFO-LOG-MIB
+CISCO-SYSAPPL-CAPABILITY.my            CISCO-SYSAPPL-CAPABILITY
+CISCO-SYSLOG-CAPABILITY.my             CISCO-SYSLOG-CAPABILITY
+CISCO-SYSLOG-EVENT-EXT-MIB.my          CISCO-SYSLOG-EVENT-EXT-MIB
+CISCO-SYSLOG-EXT-CAPABILITY.my         CISCO-SYSLOG-EXT-CAPABILITY
+CISCO-SYSLOG-EXT-MIB.my                        CISCO-SYSLOG-EXT-MIB
+CISCO-SYSLOG-MIB.my                    CISCO-SYSLOG-MIB
+CISCO-SYSTEM-CAPABILITY.my             CISCO-SYSTEM-CAPABILITY
+CISCO-SYSTEM-EXT-CAPABILITY.my         CISCO-SYSTEM-EXT-CAPABILITY
+CISCO-SYSTEM-EXT-MIB.my                        CISCO-SYSTEM-EXT-MIB
+CISCO-SYSTEM-MIB.my                    CISCO-SYSTEM-MIB
+CISCO-TBRIDGE-DEV-IF-MIB.my            CISCO-TBRIDGE-DEV-IF-MIB
+CISCO-TC-NO-U32.my                     CISCO-TC-NO-U32
+CISCO-TC.my                            CISCO-TC
+CISCO-TCP-CAPABILITY.my                        CISCO-TCP-CAPABILITY
+CISCO-TCP-METRICS-MIB.my               CISCO-TCP-METRICS-MIB
+CISCO-TCP-MIB.my                       CISCO-TCP-MIB
+CISCO-TCP-STD-CAPABILITY.my            CISCO-TCP-STD-CAPABILITY
+CISCO-TCPOFFLOAD-MIB.my                        CISCO-TCPOFFLOAD-MIB
+CISCO-TELEPRESENCE-CALL-CAPABILITY.my  CISCO-TELEPRESENCE-CALL-CAPABILITY
+CISCO-TELEPRESENCE-CALL-MIB.my         CISCO-TELEPRESENCE-CALL-MIB
+CISCO-TELEPRESENCE-CAPABILITY.my       CISCO-TELEPRESENCE-CAPABILITY
+CISCO-TELEPRESENCE-EXCHANGE-SYSTEM-CAPABILITY.my       CISCO-TELEPRESENCE-EXCHANGE-SYSTEM-CAPABILITY
+CISCO-TELEPRESENCE-EXCHANGE-SYSTEM-MIB.my      CISCO-TELEPRESENCE-EXCHANGE-SYSTEM-MIB
+CISCO-TELEPRESENCE-MIB.my              CISCO-TELEPRESENCE-MIB
+CISCO-TELNET-SERVER-MIB.my             CISCO-TELNET-SERVER-MIB
+CISCO-THREAT-MITIGATION-SERVICE-CAPABILITY.my  CISCO-THREAT-MITIGATION-SERVICE-CAPABILITY
+CISCO-THREAT-MITIGATION-SERVICE-MIB.my CISCO-THREAT-MITIGATION-SERVICE-MIB
+CISCO-TM.my                            CISCO-TM
+CISCO-TN3270SERVER-MIB.my              CISCO-TN3270SERVER-MIB
+CISCO-TPC-MIB.my                       CISCO-TPC-MIB
+CISCO-TRANSACTION-CONNECTION-MIB.my    CISCO-TRANSACTION-CONNECTION-MIB
+CISCO-TRUSTSEC-CAPABILITY.my           CISCO-TRUSTSEC-CAPABILITY
+CISCO-TRUSTSEC-INTERFACE-CAPABILITY.my CISCO-TRUSTSEC-INTERFACE-CAPABILITY
+CISCO-TRUSTSEC-INTERFACE-MIB.my                CISCO-TRUSTSEC-INTERFACE-MIB
+CISCO-TRUSTSEC-MIB.my                  CISCO-TRUSTSEC-MIB
+CISCO-TRUSTSEC-POLICY-CAPABILITY.my    CISCO-TRUSTSEC-POLICY-CAPABILITY
+CISCO-TRUSTSEC-POLICY-MIB.my           CISCO-TRUSTSEC-POLICY-MIB
+CISCO-TRUSTSEC-SERVER-CAPABILITY.my    CISCO-TRUSTSEC-SERVER-CAPABILITY
+CISCO-TRUSTSEC-SERVER-MIB.my           CISCO-TRUSTSEC-SERVER-MIB
+CISCO-TRUSTSEC-SXP-CAPABILITY.my       CISCO-TRUSTSEC-SXP-CAPABILITY
+CISCO-TRUSTSEC-SXP-MIB.my              CISCO-TRUSTSEC-SXP-MIB
+CISCO-TRUSTSEC-TC-MIB.my               CISCO-TRUSTSEC-TC-MIB
+CISCO-UBE-MIB.my                       CISCO-UBE-MIB
+CISCO-UDLDP-CAPABILITY.my              CISCO-UDLDP-CAPABILITY
+CISCO-UDLDP-MIB.my                     CISCO-UDLDP-MIB
+CISCO-UDP-STD-CAPABILITY.my            CISCO-UDP-STD-CAPABILITY
+CISCO-UNIFIED-COMPUTING-MIB.my         CISCO-UNIFIED-COMPUTING-MIB
+CISCO-UNIFIED-FIREWALL-MIB.my          CISCO-UNIFIED-FIREWALL-MIB
+CISCO-UNITY-EXPRESS-MIB.my             CISCO-UNITY-EXPRESS-MIB
+CISCO-UNITY-MIB.my                     CISCO-UNITY-MIB
+CISCO-USP-MIB.my                       CISCO-USP-MIB
+CISCO-VDC-CAPABILITY.my                        CISCO-VDC-CAPABILITY
+CISCO-VDC-MIB.my                       CISCO-VDC-MIB
+CISCO-VIDEO-SESSION-CAPABILITY.my      CISCO-VIDEO-SESSION-CAPABILITY
+CISCO-VIDEO-SESSION-MIB.my             CISCO-VIDEO-SESSION-MIB
+CISCO-VIDEO-TC.my                      CISCO-VIDEO-TC
+CISCO-VINES-MIB.my                     CISCO-VINES-MIB
+CISCO-VIRTUAL-INTERFACE-MIB.my         CISCO-VIRTUAL-INTERFACE-MIB
+CISCO-VIRTUAL-NIC-MIB.my               CISCO-VIRTUAL-NIC-MIB
+CISCO-VIRTUAL-NW-IF-MIB.my             CISCO-VIRTUAL-NW-IF-MIB
+CISCO-VIRTUAL-SWITCH-CAPABILITY.my     CISCO-VIRTUAL-SWITCH-CAPABILITY
+CISCO-VIRTUAL-SWITCH-MIB.my            CISCO-VIRTUAL-SWITCH-MIB
+CISCO-VISM-ATM-TRUNK-MIB.my            CISCO-VISM-ATM-TRUNK-MIB
+CISCO-VISM-CAC-MIB.my                  CISCO-VISM-CAC-MIB
+CISCO-VISM-CAS-MIB.my                  CISCO-VISM-CAS-MIB
+CISCO-VISM-CODEC-MIB.my                        CISCO-VISM-CODEC-MIB
+CISCO-VISM-CONN-CAPABILITY.my          CISCO-VISM-CONN-CAPABILITY
+CISCO-VISM-CONN-MIB.my                 CISCO-VISM-CONN-MIB
+CISCO-VISM-CONN-STAT-MIB.my            CISCO-VISM-CONN-STAT-MIB
+CISCO-VISM-DSX0-MIB.my                 CISCO-VISM-DSX0-MIB
+CISCO-VISM-DSX1-CAPABILITY.my          CISCO-VISM-DSX1-CAPABILITY
+CISCO-VISM-DSX1-MIB.my                 CISCO-VISM-DSX1-MIB
+CISCO-VISM-HDLC-MIB.my                 CISCO-VISM-HDLC-MIB
+CISCO-VISM-MODULE-CAPABILITY.my                CISCO-VISM-MODULE-CAPABILITY
+CISCO-VISM-MODULE-MIB.my               CISCO-VISM-MODULE-MIB
+CISCO-VISM-PORT-MIB.my                 CISCO-VISM-PORT-MIB
+CISCO-VISM-RSRC-PART-MIB.my            CISCO-VISM-RSRC-PART-MIB
+CISCO-VISM-SESSION-CAPABILITY.my       CISCO-VISM-SESSION-CAPABILITY
+CISCO-VISM-SESSION-MIB.my              CISCO-VISM-SESSION-MIB
+CISCO-VISM-SVC-MIB.my                  CISCO-VISM-SVC-MIB
+CISCO-VISM-TRAPS-MIB.my                        CISCO-VISM-TRAPS-MIB
+CISCO-VISM-XGCP-EXT.my                 CISCO-VISM-XGCP-EXT
+CISCO-VLAN-BRIDGE-MIB.my               CISCO-VLAN-BRIDGE-MIB
+CISCO-VLAN-BRIDGING-CAPABILITY.my      CISCO-VLAN-BRIDGING-CAPABILITY
+CISCO-VLAN-BRIDGING-MIB.my             CISCO-VLAN-BRIDGING-MIB
+CISCO-VLAN-GROUP-CAPABILITY.my         CISCO-VLAN-GROUP-CAPABILITY
+CISCO-VLAN-GROUP-MIB.my                        CISCO-VLAN-GROUP-MIB
+CISCO-VLAN-IFTABLE-RELATIONSHIP-CAPABILITY.my  CISCO-VLAN-IFTABLE-RELATIONSHIP-CAPABILITY
+CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB.my CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB
+CISCO-VLAN-MEMBERSHIP-CAPABILITY.my    CISCO-VLAN-MEMBERSHIP-CAPABILITY
+CISCO-VLAN-MEMBERSHIP-MIB.my           CISCO-VLAN-MEMBERSHIP-MIB
+CISCO-VLAN-TRANSLATION-CAPABILITY.my   CISCO-VLAN-TRANSLATION-CAPABILITY
+CISCO-VLAN-TRANSLATION-MIB.my          CISCO-VLAN-TRANSLATION-MIB
+CISCO-VMPS-CAPABILITY.my               CISCO-VMPS-CAPABILITY
+CISCO-VMPS-MIB.my                      CISCO-VMPS-MIB
+CISCO-VOA-MIB.my                       CISCO-VOA-MIB
+CISCO-VOICE-AALX-PROFILE-CAPABILITY.my CISCO-VOICE-AALX-PROFILE-CAPABILITY
+CISCO-VOICE-AALX-PROFILE-MIB.my                CISCO-VOICE-AALX-PROFILE-MIB
+CISCO-VOICE-ANALOG-IF-CAPABILITY.my    CISCO-VOICE-ANALOG-IF-CAPABILITY
+CISCO-VOICE-ANALOG-IF-MIB.my           CISCO-VOICE-ANALOG-IF-MIB
+CISCO-VOICE-APPLICATIONS-OID-MIB.my    CISCO-VOICE-APPLICATIONS-OID-MIB
+CISCO-VOICE-APPS-MIB.my                        CISCO-VOICE-APPS-MIB
+CISCO-VOICE-ATM-DIAL-CONTROL-MIB.my    CISCO-VOICE-ATM-DIAL-CONTROL-MIB
+CISCO-VOICE-CARD-MIB.my                        CISCO-VOICE-CARD-MIB
+CISCO-VOICE-CAS-MODULE-CAPABILITY.my   CISCO-VOICE-CAS-MODULE-CAPABILITY
+CISCO-VOICE-CAS-MODULE-MIB.my          CISCO-VOICE-CAS-MODULE-MIB
+CISCO-VOICE-COMMON-DIAL-CONTROL-MIB.my CISCO-VOICE-COMMON-DIAL-CONTROL-MIB
+CISCO-VOICE-CONNECTIVITY-MIB.my                CISCO-VOICE-CONNECTIVITY-MIB
+CISCO-VOICE-DIAL-CONTROL-CAPABILITY.my CISCO-VOICE-DIAL-CONTROL-CAPABILITY
+CISCO-VOICE-DIAL-CONTROL-MIB.my                CISCO-VOICE-DIAL-CONTROL-MIB
+CISCO-VOICE-DNIS-MIB.my                        CISCO-VOICE-DNIS-MIB
+CISCO-VOICE-ENABLED-LINK-MIB.my                CISCO-VOICE-ENABLED-LINK-MIB
+CISCO-VOICE-FR-DIAL-CONTROL-MIB.my     CISCO-VOICE-FR-DIAL-CONTROL-MIB
+CISCO-VOICE-HDLC-DIAL-CONTROL-MIB.my   CISCO-VOICE-HDLC-DIAL-CONTROL-MIB
+CISCO-VOICE-IF-MIB.my                  CISCO-VOICE-IF-MIB
+CISCO-VOICE-LMR-MIB.my                 CISCO-VOICE-LMR-MIB
+CISCO-VOICE-TONE-CADENCE-CAPABILITY.my CISCO-VOICE-TONE-CADENCE-CAPABILITY
+CISCO-VOICE-TONE-CADENCE-MIB.my                CISCO-VOICE-TONE-CADENCE-MIB
+CISCO-VOICE-URI-CLASS-MIB.my           CISCO-VOICE-URI-CLASS-MIB
+CISCO-VPC-CAPABILITY.my                        CISCO-VPC-CAPABILITY
+CISCO-VPC-MIB.my                       CISCO-VPC-MIB
+CISCO-VPDN-MGMT-EXT-MIB.my             CISCO-VPDN-MGMT-EXT-MIB
+CISCO-VPDN-MGMT-MIB.my                 CISCO-VPDN-MGMT-MIB
+CISCO-VPN-LIC-USAGE-MONITOR-MIB.my     CISCO-VPN-LIC-USAGE-MONITOR-MIB
+CISCO-VQE-TOOLS-MIB.my                 CISCO-VQE-TOOLS-MIB
+CISCO-VQES-MIB.my                      CISCO-VQES-MIB
+CISCO-VRF-MIB.my                       CISCO-VRF-MIB
+CISCO-VSAN-MIB.my                      CISCO-VSAN-MIB
+CISCO-VSI-CONTROLLER-CAPABILITY.my     CISCO-VSI-CONTROLLER-CAPABILITY
+CISCO-VSI-CONTROLLER-MIB.my            CISCO-VSI-CONTROLLER-MIB
+CISCO-VSIMASTER-MIB.my                 CISCO-VSIMASTER-MIB
+CISCO-VTP-CAPABILITY.my                        CISCO-VTP-CAPABILITY
+CISCO-VTP-MIB.my                       CISCO-VTP-MIB
+CISCO-WAN-3G-MIB.my                    CISCO-WAN-3G-MIB
+CISCO-WAN-AAL2-PROFILES-MIB.my         CISCO-WAN-AAL2-PROFILES-MIB
+CISCO-WAN-ANNOUNCEMENT-MIB.my          CISCO-WAN-ANNOUNCEMENT-MIB
+CISCO-WAN-ATM-CONN-CAPABILITY.my       CISCO-WAN-ATM-CONN-CAPABILITY
+CISCO-WAN-ATM-CONN-MIB.my              CISCO-WAN-ATM-CONN-MIB
+CISCO-WAN-ATM-CONN-STAT-CAPABILITY.my  CISCO-WAN-ATM-CONN-STAT-CAPABILITY
+CISCO-WAN-ATM-CONN-STAT-MIB.my         CISCO-WAN-ATM-CONN-STAT-MIB
+CISCO-WAN-ATM-COSB-MIB.my              CISCO-WAN-ATM-COSB-MIB
+CISCO-WAN-ATM-CUG-MIB.my               CISCO-WAN-ATM-CUG-MIB
+CISCO-WAN-ATM-PARTY-MIB.my             CISCO-WAN-ATM-PARTY-MIB
+CISCO-WAN-ATM-PREF-ROUTE-MIB.my                CISCO-WAN-ATM-PREF-ROUTE-MIB
+CISCO-WAN-BBIF-ATM-CONN-MIB.my         CISCO-WAN-BBIF-ATM-CONN-MIB
+CISCO-WAN-BBIF-ATM-CONN-STAT-MIB.my    CISCO-WAN-BBIF-ATM-CONN-STAT-MIB
+CISCO-WAN-BBIF-ILMI-MIB.my             CISCO-WAN-BBIF-ILMI-MIB
+CISCO-WAN-BBIF-PORT-MIB.my             CISCO-WAN-BBIF-PORT-MIB
+CISCO-WAN-CELL-EXT-CAPABILITY.my       CISCO-WAN-CELL-EXT-CAPABILITY
+CISCO-WAN-CELL-EXT-MIB.my              CISCO-WAN-CELL-EXT-MIB
+CISCO-WAN-CES-CONN-MIB.my              CISCO-WAN-CES-CONN-MIB
+CISCO-WAN-CES-CONN-STAT-MIB.my         CISCO-WAN-CES-CONN-STAT-MIB
+CISCO-WAN-CES-PORT-MIB.my              CISCO-WAN-CES-PORT-MIB
+CISCO-WAN-CES-RSRC-PART-MIB.my         CISCO-WAN-CES-RSRC-PART-MIB
+CISCO-WAN-CODEC-GEN-PARM-MIB.my                CISCO-WAN-CODEC-GEN-PARM-MIB
+CISCO-WAN-FEEDER-MIB.my                        CISCO-WAN-FEEDER-MIB
+CISCO-WAN-FR-CONN-MIB.my               CISCO-WAN-FR-CONN-MIB
+CISCO-WAN-FR-CONN-STAT-MIB.my          CISCO-WAN-FR-CONN-STAT-MIB
+CISCO-WAN-FR-PORT-MIB.my               CISCO-WAN-FR-PORT-MIB
+CISCO-WAN-FR-RSRC-PART-MIB.my          CISCO-WAN-FR-RSRC-PART-MIB
+CISCO-WAN-FR-SIGNALING-MIB.my          CISCO-WAN-FR-SIGNALING-MIB
+CISCO-WAN-FR-X21-MIB.my                        CISCO-WAN-FR-X21-MIB
+CISCO-WAN-LAPD-TRUNK-MIB.my            CISCO-WAN-LAPD-TRUNK-MIB
+CISCO-WAN-MG-MIB.my                    CISCO-WAN-MG-MIB
+CISCO-WAN-MGC-REDUN-MIB.my             CISCO-WAN-MGC-REDUN-MIB
+CISCO-WAN-MODULE-CAPABILITY.my         CISCO-WAN-MODULE-CAPABILITY
+CISCO-WAN-MODULE-MIB.my                        CISCO-WAN-MODULE-MIB
+CISCO-WAN-NCDP-CAPABILITY.my           CISCO-WAN-NCDP-CAPABILITY
+CISCO-WAN-NCDP-MIB.my                  CISCO-WAN-NCDP-MIB
+CISCO-WAN-OPTIMIZATION-CAPABILITY.my   CISCO-WAN-OPTIMIZATION-CAPABILITY
+CISCO-WAN-OPTIMIZATION-MIB.my          CISCO-WAN-OPTIMIZATION-MIB
+CISCO-WAN-PAR-MIB.my                   CISCO-WAN-PAR-MIB
+CISCO-WAN-PERSISTENT-XGCP-EVENTS-MIB.my        CISCO-WAN-PERSISTENT-XGCP-EVENTS-MIB
+CISCO-WAN-RPM-CONN-EXT-MIB.my          CISCO-WAN-RPM-CONN-EXT-MIB
+CISCO-WAN-RSRC-PART-CAPABILITY.my      CISCO-WAN-RSRC-PART-CAPABILITY
+CISCO-WAN-RSRC-PART-MIB.my             CISCO-WAN-RSRC-PART-MIB
+CISCO-WAN-RTP-CONN-MIB.my              CISCO-WAN-RTP-CONN-MIB
+CISCO-WAN-SCT-MGMT-MIB.my              CISCO-WAN-SCT-MGMT-MIB
+CISCO-WAN-SONET-MIB.my                 CISCO-WAN-SONET-MIB
+CISCO-WAN-SRCP-MIB.my                  CISCO-WAN-SRCP-MIB
+CISCO-WAN-SRM-BERT-MIB.my              CISCO-WAN-SRM-BERT-MIB
+CISCO-WAN-SRM-MIB.my                   CISCO-WAN-SRM-MIB
+CISCO-WAN-SVC-MIB.my                   CISCO-WAN-SVC-MIB
+CISCO-WAN-T38-FAXRELAY-MIB.my          CISCO-WAN-T38-FAXRELAY-MIB
+CISCO-WAN-TOPOLOGY-CAPABILITY.my       CISCO-WAN-TOPOLOGY-CAPABILITY
+CISCO-WAN-TOPOLOGY-MIB.my              CISCO-WAN-TOPOLOGY-MIB
+CISCO-WAN-TRAP-VARS-MIB.my             CISCO-WAN-TRAP-VARS-MIB
+CISCO-WAN-VISM-TONE-PLAN-MIB.my                CISCO-WAN-VISM-TONE-PLAN-MIB
+CISCO-WBX-MEETING-MIB.my               CISCO-WBX-MEETING-MIB
+CISCO-WDS-IDS-CAPABILITY.my            CISCO-WDS-IDS-CAPABILITY
+CISCO-WDS-IDS-MIB.my                   CISCO-WDS-IDS-MIB
+CISCO-WDS-INFO-MIB.my                  CISCO-WDS-INFO-MIB
+CISCO-WIRELESS-DOCS-EXT-MIB.my         CISCO-WIRELESS-DOCS-EXT-MIB
+CISCO-WIRELESS-DOCS-IF-MIB.my          CISCO-WIRELESS-DOCS-IF-MIB
+CISCO-WIRELESS-EXP-MIB.my              CISCO-WIRELESS-EXP-MIB
+CISCO-WIRELESS-IF-MIB.my               CISCO-WIRELESS-IF-MIB
+CISCO-WIRELESS-NOTIFICATION-MIB.my     CISCO-WIRELESS-NOTIFICATION-MIB
+CISCO-WIRELESS-P2MP-LINK-METRICS-MIB.my        CISCO-WIRELESS-P2MP-LINK-METRICS-MIB
+CISCO-WIRELESS-P2MP-PHY-MIB.my         CISCO-WIRELESS-P2MP-PHY-MIB
+CISCO-WIRELESS-P2MP-RF-METRICS-MIB.my  CISCO-WIRELESS-P2MP-RF-METRICS-MIB
+CISCO-WIRELESS-P2P-BPI-MIB.my          CISCO-WIRELESS-P2P-BPI-MIB
+CISCO-WIRELESS-TC-MIB.my               CISCO-WIRELESS-TC-MIB
+CISCO-WLAN-MAN-MIB.my                  CISCO-WLAN-MAN-MIB
+CISCO-WLAN-VLAN-MIB.my                 CISCO-WLAN-VLAN-MIB
+CISCO-WPAN-MIB.my                      CISCO-WPAN-MIB
+CISCO-WRED-MIB.my                      CISCO-WRED-MIB
+CISCO-WWNMGR-MIB.my                    CISCO-WWNMGR-MIB
+CISCO-XDSL-LINE-MIB.my                 CISCO-XDSL-LINE-MIB
+CISCO-XGCP-CAPABILITY.my               CISCO-XGCP-CAPABILITY
+CISCO-XGCP-EXT-CAPABILITY.my           CISCO-XGCP-EXT-CAPABILITY
+CISCO-XGCP-EXT-MIB.my                  CISCO-XGCP-EXT-MIB
+CISCO-XGCP-MIB.my                      CISCO-XGCP-MIB
+CISCO-ZS-EXT-MIB.my                    CISCO-ZS-EXT-MIB
+CISCO-ZS-MIB.my                                CISCO-ZS-MIB
+CISCOWAN-SMI.my                                CISCOWAN-SMI
+CISCOWORKS-MIB.my                      CISCOWORKS-MIB
+CLAB-DEF-MIB.my                                CLAB-DEF-MIB
+CLAB-TOPO-MIB.my                       CLAB-TOPO-MIB
+COMPAT-MIB.my                          COMPAT-MIB
+DIAL-CONTROL-MIB.my                    DIAL-CONTROL-MIB
+DIFFSERV-DSCP-TC.my                    DIFFSERV-DSCP-TC
+DIFFSERV-MIB-CAPABILITY.my             DIFFSERV-MIB-CAPABILITY
+DIFFSERV-MIB.my                                DIFFSERV-MIB
+DISMAN-EXPRESSION-MIB.my               DISMAN-EXPRESSION-MIB
+DISMAN-NSLOOKUP-MIB.my                 DISMAN-NSLOOKUP-MIB
+DISMAN-PING-MIB.my                     DISMAN-PING-MIB
+DISMAN-TRACEROUTE-MIB.my               DISMAN-TRACEROUTE-MIB
+DLSW-MIB.my                            DLSW-MIB
+DLUR-MIB.my                            DLUR-MIB
+DOCS-BPI-MIB.my                                DOCS-BPI-MIB
+DOCS-BPI-PLUS-MIB.my                   DOCS-BPI-PLUS-MIB
+DOCS-CABLE-DEVICE-MIB.my               DOCS-CABLE-DEVICE-MIB
+DOCS-CABLE-DEVICE-TRAP-MIB.my          DOCS-CABLE-DEVICE-TRAP-MIB
+DOCS-DIAG-MIB.my                       DOCS-DIAG-MIB
+DOCS-DRF-MIB.my                                DOCS-DRF-MIB
+DOCS-DSG-IF-MIB.my                     DOCS-DSG-IF-MIB
+DOCS-IETF-BPI2-MIB.my                  DOCS-IETF-BPI2-MIB
+DOCS-IETF-CABLE-DEVICE-NOTIFICATION-MIB.my     DOCS-IETF-CABLE-DEVICE-NOTIFICATION-MIB
+DOCS-IETF-QOS-MIB.my                   DOCS-IETF-QOS-MIB
+DOCS-IF-EXT-MIB.my                     DOCS-IF-EXT-MIB
+DOCS-IF-M-CMTS-MIB.my                  DOCS-IF-M-CMTS-MIB
+DOCS-IF-MIB.my                         DOCS-IF-MIB
+DOCS-IF3-MIB.my                                DOCS-IF3-MIB
+DOCS-IFEXT2-MIB.my                     DOCS-IFEXT2-MIB
+DOCS-L2VPN-MIB.my                      DOCS-L2VPN-MIB
+DOCS-LOADBAL3-MIB.my                   DOCS-LOADBAL3-MIB
+DOCS-LOADBALANCING-MIB.my              DOCS-LOADBALANCING-MIB
+DOCS-MCAST-AUTH-MIB.my                 DOCS-MCAST-AUTH-MIB
+DOCS-MCAST-MIB.my                      DOCS-MCAST-MIB
+DOCS-QOS-MIB.my                                DOCS-QOS-MIB
+DOCS-QOS3-MIB.my                       DOCS-QOS3-MIB
+DOCS-SEC-MIB.my                                DOCS-SEC-MIB
+DOCS-SUBMGT-MIB.my                     DOCS-SUBMGT-MIB
+DOCS-SUBMGT3-MIB.my                    DOCS-SUBMGT3-MIB
+DOCS-TEST-MIB.my                       DOCS-TEST-MIB
+DOT12-IF-MIB.my                                DOT12-IF-MIB
+DOT3-MAU-MIB.my                                DOT3-MAU-MIB
+DS1-MIB.my                             DS1-MIB
+DS3-MIB.my                             DS3-MIB
+DSG-IF-MIB.my                          DSG-IF-MIB
+DTI-MIB.my                             DTI-MIB
+ENERGY-OBJECT-MIB.my                   ENERGY-OBJECT-MIB
+ENTITY-MIB.my                          ENTITY-MIB
+ENTITY-SENSOR-MIB.my                   ENTITY-SENSOR-MIB
+ENTITY-STATE-MIB.my                    ENTITY-STATE-MIB
+ENTITY-STATE-TC-MIB.my                 ENTITY-STATE-TC-MIB
+ETHER-WIS.my                           ETHER-WIS
+EVENT-MIB.my                           EVENT-MIB
+EXPRESSION-MIB.my                      EXPRESSION-MIB
+EtherLike-MIB.my                       EtherLike-MIB
+FC-MGMT-MIB.my                         FC-MGMT-MIB
+FIBRE-CHANNEL-FE-MIB.my                        FIBRE-CHANNEL-FE-MIB
+FR-MFR-MIB.my                          FR-MFR-MIB
+FRAME-RELAY-DTE-MIB.my                 FRAME-RELAY-DTE-MIB
+GENERICOBJECT-MIB.my                   GENERICOBJECT-MIB
+HC-ALARM-MIB.my                                HC-ALARM-MIB
+HC-PerfHist-TC-MIB.my                  HC-PerfHist-TC-MIB
+HC-RMON-MIB.my                         HC-RMON-MIB
+HCNUM-TC.my                            HCNUM-TC
+HDSL2-SHDSL-LINE-MIB.my                        HDSL2-SHDSL-LINE-MIB
+HOST-RESOURCES-MIB.my                  HOST-RESOURCES-MIB
+HOST-RESOURCES-TYPES.my                        HOST-RESOURCES-TYPES
+IANA-ADDRESS-FAMILY-NUMBERS-MIB.my     IANA-ADDRESS-FAMILY-NUMBERS-MIB
+IANA-MAU-MIB.my                                IANA-MAU-MIB
+IANA-RTPROTO-MIB.my                    IANA-RTPROTO-MIB
+IANAPowerStateSet-MIB.my               IANAPowerStateSet-MIB
+IANATn3270eTC-MIB.my                   IANATn3270eTC-MIB
+IANAifType-MIB.my                      IANAifType-MIB
+IEEE-802DOT17-RPR-MIB.my               IEEE-802DOT17-RPR-MIB
+IEEE8021-CFM-MIB.my                    IEEE8021-CFM-MIB
+IEEE8021-CFM-V2-MIB.my                 IEEE8021-CFM-V2-MIB
+IEEE8021-PAE-MIB.my                    IEEE8021-PAE-MIB
+IEEE8021-SECY-MIB.my                   IEEE8021-SECY-MIB
+IEEE8021-TC-MIB.my                     IEEE8021-TC-MIB
+IEEE8023-LAG-MIB.my                    IEEE8023-LAG-MIB
+IEEE802dot11-MIB.my                    IEEE802dot11-MIB
+IF-MIB.my                              IF-MIB
+IGMP-MIB.my                            IGMP-MIB
+IGMP-STD-MIB.my                                IGMP-STD-MIB
+IMA-MIB.my                             IMA-MIB
+INET-ADDRESS-MIB.my                    INET-ADDRESS-MIB
+INT-SERV-GUARANTEED-MIB.my             INT-SERV-GUARANTEED-MIB
+INT-SERV-MIB.my                                INT-SERV-MIB
+INTEGRATED-SERVICES-MIB.my             INTEGRATED-SERVICES-MIB
+INTERFACETOPN-MIB.my                   INTERFACETOPN-MIB
+IP-FORWARD-MIB.my                      IP-FORWARD-MIB
+IP-MIB.my                              IP-MIB
+IPMCAST-MIB.my                         IPMCAST-MIB
+IPMROUTE-MIB.my                                IPMROUTE-MIB
+IPMROUTE-STD-MIB.my                    IPMROUTE-STD-MIB
+IPV6-FLOW-LABEL-MIB.my                 IPV6-FLOW-LABEL-MIB
+IPV6-MIB.my                            IPV6-MIB
+IPV6-MLD-MIB.my                                IPV6-MLD-MIB
+IPV6-TC.my                             IPV6-TC
+ISDN-MIB.my                            ISDN-MIB
+ISIS-CAPABILTY-MIB.my                  ISIS-CAPABILTY-MIB
+ISIS-MIB.my                            ISIS-MIB
+ITU-ALARM-TC-MIB.my                    ITU-ALARM-TC-MIB
+Job-Monitoring-MIB.my                  Job-Monitoring-MIB
+LAN-EMULATION-CLIENT-MIB.my            LAN-EMULATION-CLIENT-MIB
+LANGTAG-TC-MIB.my                      LANGTAG-TC-MIB
+LANOPTICS-ALERTS-MIB.my                        LANOPTICS-ALERTS-MIB
+LANOPTICS-BRIDGE-OPTION-MIB.my         LANOPTICS-BRIDGE-OPTION-MIB
+LANOPTICS-ETHERNET-OPTION-MIB.my       LANOPTICS-ETHERNET-OPTION-MIB
+LANOPTICS-HUB-MIB.my                   LANOPTICS-HUB-MIB
+LANOPTICS-RING-MANAGER-MIB.my          LANOPTICS-RING-MANAGER-MIB
+LANOPTICS-SYSTEM-MIB.my                        LANOPTICS-SYSTEM-MIB
+LISP-MIB.my                            LISP-MIB
+LLDP-EXT-DOT1-MIB.my                   LLDP-EXT-DOT1-MIB
+LLDP-EXT-DOT3-MIB.my                   LLDP-EXT-DOT3-MIB
+LLDP-EXT-MED-MIB.my                    LLDP-EXT-MED-MIB
+LLDP-MED-MIB.my                                LLDP-MED-MIB
+LLDP-MIB.my                            LLDP-MIB
+MAU-MIB.my                             MAU-MIB
+MEF-SOAM-PM-MIB.my                     MEF-SOAM-PM-MIB
+MEF-SOAM-TC-MIB.my                     MEF-SOAM-TC-MIB
+MIP-MIB.my                             MIP-MIB
+MPLS-L3VPN-STD-MIB.my                  MPLS-L3VPN-STD-MIB
+MPLS-LDP-CAPABILITY.my                 MPLS-LDP-CAPABILITY
+MPLS-LDP-GENERIC-STD-MIB.my            MPLS-LDP-GENERIC-STD-MIB
+MPLS-LDP-MIB.my                                MPLS-LDP-MIB
+MPLS-LDP-STD-MIB.my                    MPLS-LDP-STD-MIB
+MPLS-LSR-MIB-CAPABILITY.my             MPLS-LSR-MIB-CAPABILITY
+MPLS-LSR-MIB.my                                MPLS-LSR-MIB
+MPLS-LSR-STD-MIB.my                    MPLS-LSR-STD-MIB
+MPLS-TC-MIB.my                         MPLS-TC-MIB
+MPLS-TC-STD-MIB.my                     MPLS-TC-STD-MIB
+MPLS-TE-CAPABILITY.my                  MPLS-TE-CAPABILITY
+MPLS-TE-MIB.my                         MPLS-TE-MIB
+MPLS-TE-STD-MIB.my                     MPLS-TE-STD-MIB
+MPLS-VPN-MIB.my                                MPLS-VPN-MIB
+MPOA-MIB.my                            MPOA-MIB
+MSDP-MIB.my                            MSDP-MIB
+NAT-MIB.my                             NAT-MIB
+NETRANGER.my                           NETRANGER
+NHRP-MIB.my                            NHRP-MIB
+NOTIFICATION-LOG-MIB.my                        NOTIFICATION-LOG-MIB
+NTPv4-MIB.my                           NTPv4-MIB
+OLD-CISCO-CHASSIS-MIB.my               OLD-CISCO-CHASSIS-MIB
+ONS15501-CAPABILITY.my                 ONS15501-CAPABILITY
+ONS15501-MIB.my                                ONS15501-MIB
+OSPF-MIB.my                            OSPF-MIB
+OSPF-TRAP-MIB.my                       OSPF-TRAP-MIB
+OSPFV3-MIB.my                          OSPFV3-MIB
+P-BRIDGE-MIB.my                                P-BRIDGE-MIB
+P-BRIDGE.my                            P-BRIDGE
+PCUBE-CONFIG-COPY.my                   PCUBE-CONFIG-COPY
+PCUBE-ENGAGE-MIB.my                    PCUBE-ENGAGE-MIB
+PCUBE-PRODUCTS.my                      PCUBE-PRODUCTS
+PCUBE-SE-MIB.my                                PCUBE-SE-MIB
+PCUBE-SMI.my                           PCUBE-SMI
+PIM-MIB.my                             PIM-MIB
+PNNI-MIB.my                            PNNI-MIB
+POWER-ETHERNET-MIB.my                  POWER-ETHERNET-MIB
+PTOPO-MIB.my                           PTOPO-MIB
+PerfHist-TC-MIB.my                     PerfHist-TC-MIB
+Printer-MIB.my                         Printer-MIB
+Q-BRIDGE-MIB.my                                Q-BRIDGE-MIB
+Q-BRIDGE.my                            Q-BRIDGE
+RADIUS-ACC-CLIENT-MIB.my               RADIUS-ACC-CLIENT-MIB
+RADIUS-AUTH-CLIENT-MIB.my              RADIUS-AUTH-CLIENT-MIB
+RFC2006-MIB.my                         RFC2006-MIB
+RFC2668-MIB.my                         RFC2668-MIB
+RFC2982-MIB.my                         RFC2982-MIB
+RFC5131-MIB.my                         RFC5131-MIB
+RIPv2-MIB.my                           RIPv2-MIB
+RMON-MIB.my                            RMON-MIB
+RMON2-MIB.my                           RMON2-MIB
+RS-232-MIB.my                          RS-232-MIB
+RSVP-MIB.my                            RSVP-MIB
+RTM-MIB.my                             RTM-MIB
+SCTE-HMS-HEADENDIDENT-TC-MIB.my                SCTE-HMS-HEADENDIDENT-TC-MIB
+SCTE-HMS-MPEG-MIB.my                   SCTE-HMS-MPEG-MIB
+SCTE-HMS-QAM-MIB.my                    SCTE-HMS-QAM-MIB
+SMON-MIB.my                            SMON-MIB
+SNA-NAU-MIB.my                         SNA-NAU-MIB
+SNA-SDLC-MIB.my                                SNA-SDLC-MIB
+SNMP-COMMUNITY-MIB.my                  SNMP-COMMUNITY-MIB
+SNMP-FRAMEWORK-MIB.my                  SNMP-FRAMEWORK-MIB
+SNMP-MPD-MIB.my                                SNMP-MPD-MIB
+SNMP-NOTIFICATION-MIB.my               SNMP-NOTIFICATION-MIB
+SNMP-PROXY-MIB.my                      SNMP-PROXY-MIB
+SNMP-TARGET-MIB.my                     SNMP-TARGET-MIB
+SNMP-USER-BASED-SM-MIB.my              SNMP-USER-BASED-SM-MIB
+SNMP-USM-AES-MIB.my                    SNMP-USM-AES-MIB
+SNMP-USM-MIB.my                                SNMP-USM-MIB
+SNMP-VACM-MIB.my                       SNMP-VACM-MIB
+SNMP-VIEW-BASED-ACM-MIB.my             SNMP-VIEW-BASED-ACM-MIB
+SNMPv2-CONF.my                         SNMPv2-CONF
+SNMPv2-MIB.my                          SNMPv2-MIB
+SNMPv2-SMI.my                          SNMPv2-SMI
+SNMPv2-TC.my                           SNMPv2-TC
+SONET-MIB.my                           SONET-MIB
+SYSAPPL-MIB.my                         SYSAPPL-MIB
+SYSLOG-MIB.my                          SYSLOG-MIB
+SYSLOG-TC-MIB.my                       SYSLOG-TC-MIB
+T11-TC-MIB.my                          T11-TC-MIB
+TCP-MIB.my                             TCP-MIB
+TN3270E-MIB.my                         TN3270E-MIB
+TN3270E-RT-MIB.my                      TN3270E-RT-MIB
+TOKENRING-MIB.my                       TOKENRING-MIB
+TUNNEL-MIB.my                          TUNNEL-MIB
+UDP-MIB.my                             UDP-MIB
+VDSL2-LINE-MIB.my                      VDSL2-LINE-MIB
+VDSL2-LINE-TC-MIB.my                   VDSL2-LINE-TC-MIB
+VPN-TC-STD-MIB.my                      VPN-TC-STD-MIB
+VRRP-MIB.my                            VRRP-MIB
+XGCP-MIB.my                            XGCP-MIB
+draft-ietf-ipfc-fcmgmt-int-mib-04.my   FCMGMT-MIB
diff --git a/snmp-mibs-downloader/junos.conf b/snmp-mibs-downloader/junos.conf

new file mode 100644 (file)

index 0000000..0729a39
--- /dev/null
+++ b/snmp-mibs-downloader/junos.conf
@@ -0,0 +1,10 @@
+# Configuarions for Juniper JUNOS SNMPv2 MIBs download from juniper.net
+#
+
+HOST=http://www.juniper.net
+ARCHIVE=juniper-mibs-10.0R1.8.zip
+ARCHTYPE=zip
+ARCHDIR=JuniperMibs
+DIR=techpubs/software/junos/junos100
+CONF=junoslist
+DEST=juniper
diff --git a/snmp-mibs-downloader/junoslist b/snmp-mibs-downloader/junoslist

new file mode 100644 (file)

index 0000000..53a54d3
--- /dev/null
+++ b/snmp-mibs-downloader/junoslist
@@ -0,0 +1,74 @@
+mib-jnx-analyzer.txt           JUNIPER-ANALYZER-MIB
+mib-jnx-atm-cos.txt            JUNIPER-ATM-COS-MIB
+mib-jnx-atm.txt                        JUNIPER-ATM-MIB
+mib-jnx-bfd-exp.txt            BFD-STD-MIB  
+mib-jnx-bfd.txt                        JUNIPER-BFD-MIB  
+mib-jnx-bgpmib2.txt            BGP4-V2-MIB-JUNIPER
+mib-jnx-cfgmgmt.txt            JUNIPER-CFGMGMT-MIB
+mib-jnx-chas-defines.txt       JUNIPER-CHASSIS-DEFINES-MIB
+mib-jnx-chassis-alarm.txt      JUNIPER-ALARM-MIB
+mib-jnx-chassis-fwdd.txt       JUNIPER-CHASSIS-FWDD-MIB
+mib-jnx-chassis.txt            JUNIPER-MIB
+mib-jnx-coll.txt               JUNIPER-COLLECTOR-MIB
+mib-jnx-cos.txt                        JUNIPER-COS-MIB
+mib-jnx-dcu.txt                        JUNIPER-DCU-MIB
+mib-jnx-dfc.txt                        JUNIPER-DFC-MIB
+mib-jnx-event.txt              JUNIPER-EVENT-MIB
+mib-jnx-ex-mac-notification.txt        JUNIPER-EX-MAC-NOTIFICATION-MIB
+mib-jnx-exp.txt                        JUNIPER-EXPERIMENT-MIB
+mib-jnx-ex-smi.txt             JUNIPER-EX-SMI
+mib-jnx-firewall.txt           JUNIPER-FIREWALL-MIB
+mib-jnx-hostresources.txt      JUNIPER-HOSTRESOURCES-MIB
+mib-jnx-if-extensions.txt      JUNIPER-IF-MIB
+mib-jnx-ipforward.txt          JUNIPER-IPFORWARD-MIB
+mib-jnx-ipsec-flow-mon.txt     JUNIPER-IPSEC-FLOW-MON-MIB
+mib-jnx-ipsec-monitor-asp.txt  JNX-IPSEC-MONITOR-MIB
+mib-jnx-ipv4.txt               JUNIPER-IPv4-MIB
+mib-jnx-ipv6.txt               JUNIPER-IPv6-MIB
+mib-jnx-js-auth.txt            JUNIPER-JS-AUTH-MIB
+mib-jnx-js-cert.txt            JUNIPER-JS-CERT-MIB
+mib-jnx-js-dns.txt             JUNIPER-JS-DNS-MIB
+mib-jnx-js-idp.txt             JUNIPER-JS-IDP-MIB
+mib-jnx-js-if-ext.txt          JUNIPER-JS-IF-EXT-MIB
+mib-jnx-js-ipsec-vpn.txt       JUNIPER-JS-IPSEC-VPN-MIB
+mib-jnx-js-nat.txt             JUNIPER-JS-NAT-MIB
+mib-jnx-js-policy.txt          JUNIPER-JS-POLICY-MIB
+mib-jnx-jsrpd.txt              JUNIPER-CHASSIS-CLUSTER-MIB
+mib-jnx-js-screening.txt       JUNIPER-JS-SCREENING-MIB
+mib-jnx-js-smi.txt             JUNIPER-JS-SMI
+mib-jnx-js-spu-monitoring.txt  JUNIPER-SRX5000-SPU-MONITORING-MIB
+mib-jnx-js-utm-av.txt          JUNIPER-JS-UTM-AV-MIB
+mib-jnx-l2ald.txt              JUNIPER-L2ALD-MIB
+mib-jnx-l2cp-features.txt      JUNIPER-L2CP-FEATURES-MIB
+mib-jnx-l2tp.txt               JNX-L2TP-MIB
+mib-jnx-ldp.txt                        JUNIPER-LDP-MIB
+mib-jnx-mac.txt                        JUNIPER-MAC-MIB
+mib-jnx-mimstp.txt             JUNIPER-MIMSTP-MIB
+mib-jnx-mpls-ldp.txt           JUNIPER-MPLS-LDP-MIB
+mib-jnx-ospfv3mib.txt          OSPFV3-MIB-JUNIPER 
+mib-jnx-otn.txt                        JUNIPER-OTN-MIB
+mib-jnx-pae-extension.txt      JUNIPER-PAE-EXTENSION-MIB
+mib-jnx-pfe.txt                        JUNIPER-PFE-MIB
+mib-jnx-ping.txt               JUNIPER-PING-MIB
+mib-jnx-pmon.txt               JUNIPER-PMon-MIB
+mib-jnx-pwtdm.txt              JUNIPER-PW-TDM-MIB
+mib-jnx-rmon.txt               JUNIPER-RMON-MIB
+mib-jnx-rpf.txt                        JUNIPER-RPF-MIB
+mib-jnx-rpm.txt                        JUNIPER-RPM-MIB
+mib-jnx-rps.txt                        JUNIPER-RPS-MIB
+mib-jnx-rsvp.txt               JUNIPER-RSVP-MIB
+mib-jnx-rtm.txt                        JUNIPER-RTM-MIB
+mib-jnx-scu.txt                        JUNIPER-SCU-MIB
+mib-jnx-secure-access-port.txt JUNIPER-SECURE-ACCESS-PORT-MIB
+mib-jnx-sipcommon.txt          JUNIPER-SIP-COMMON-MIB
+mib-jnx-smi.txt                        JUNIPER-SMI
+mib-jnx-sonetaps.txt           APS-MIB
+mib-jnx-sonet.txt              JUNIPER-SONET-MIB
+mib-jnx-sp.txt                 JUNIPER-SP-MIB
+mib-jnx-syslog.txt             JUNIPER-SYSLOG-MIB
+mib-jnx-traceroute.txt         JUNIPER-TRACEROUTE-MIB
+mib-jnx-user-aaa.txt           JUNIPER-USER-AAA-MIB
+mib-jnx-util.txt               JUNIPER-UTIL-MIB
+mib-jnx-virtualchassis.txt     JUNIPER-VIRTUALCHASSIS-MIB 
+mib-jnx-vlan.txt               JUNIPER-VLAN-MIB
+mib-jnx-vpn.txt                        JUNIPER-VPN-MIB
diff --git a/snmp-mibs-downloader/screenos.conf b/snmp-mibs-downloader/screenos.conf

new file mode 100644 (file)

index 0000000..130a82e
--- /dev/null
+++ b/snmp-mibs-downloader/screenos.conf
@@ -0,0 +1,10 @@
+# Configuarions for Juniper ScreenOS SNMPv2 MIBs download from juniper.net
+#
+
+HOST=http://www.juniper.net
+ARCHIVE=6.3mib.zip
+ARCHTYPE=zip
+ARCHDIR=6.3mib/6.3mib/snmpv2
+DIR=techpubs/software/screenos/screenos6.3.0
+CONF=screenoslist
+DEST=juniper
diff --git a/snmp-mibs-downloader/screenoslist b/snmp-mibs-downloader/screenoslist

new file mode 100644 (file)

index 0000000..fca218f
--- /dev/null
+++ b/snmp-mibs-downloader/screenoslist
@@ -0,0 +1,47 @@
+NS-ADDR.mib            NETSCREEN-ADDR-MIB
+NS-BGP4.mib            NETSCREEN-BGP4-MIB
+NS-CHASSIS.mib         NETSCREEN-CHASSIS-MIB
+NS-IDS.mib             NETSCREEN-IDS-MIB
+NS-INTERFACE.mib       NETSCREEN-INTERFACE-MIB
+NS-IP-ARP.mib          NETSCREEN-IP-ARP-MIB
+NS-NAT.mib             NETSCREEN-NAT-MIB
+NS-NSRP.mib            NETSCREEN-NSRP-MIB
+NS-OSPF.mib            NETSCREEN-OSPF-MIB
+NS-OSPF-TRAP.mib       NETSCREEN-OSPF-TRAP-MIB
+NS-POLICY.mib          NETSCREEN-POLICY-MIB
+NS-PRODUCTS.mib                NETSCREEN-PRODUCTS-MIB
+NS-QOS.mib             NETSCREEN-QOS-MIB
+NS-RES.mib             NETSCREEN-RESOURCE-MIB
+NS-RIP.mib             NETSCREEN-RIPv2-MIB
+NS-SCHEDULE.mib                NETSCREEN-SCHEDULE-MIB
+NS-SERVICE.mib         NETSCREEN-SERVICE-MIB
+NS-SET-ADMIN-USR.mib   NETSCREEN-SET-ADMIN-USR-MIB
+NS-SET-AUTH.mib                NETSCREEN-SET-AUTH-MIB
+NS-SET-DHCP.mib                NETSCREEN-SET-DHCP-MIB
+NS-SET-DNS.mib         NETSCREEN-SET-DNS-MIB
+NS-SET-EMAIL.mib       NETSCREEN-SET-EMAIL-MIB
+NS-SET-GEN.mib         NETSCREEN-SET-GEN-MIB
+NS-SET-GLB.mib         NETSCREEN-SET-GLB-MIB
+NS-SET-LOG.mib         NETSCREEN-SET-LOG-MIB
+NS-SET-SNMP.mib                NETSCREEN-SET-SNMP-MIB
+NS-SET-SYSTIME.mib     NETSCREEN-SET-SYSTIME-MIB
+NS-SET-URL-FILTER.mib  NETSCREEN-SET-URL-FILTER-MIB
+NS-SET-WEB.mib         NETSCREEN-SET-WEB-MIB
+NS-SMI.mib             NETSCREEN-SMI
+NS-TRAPS.mib           NETSCREEN-TRAP-MIB
+NS-VPN-CERT.mib                NETSCREEN-CERTIFICATE-MIB
+NS-VPN-GW.mib          NETSCREEN-VPN-GATEWAY-MIB
+NS-VPN-IKE.mib         NETSCREEN-VPN-IKE-MIB
+NS-VPN-IPPOOL.mib      NETSCREEN-IPPOOL-MIB
+NS-VPN-L2TP.mib                NETSCREEN-VPN-L2TP-MIB
+NS-VPN-MANUAL.mib      NETSCREEN-VPN-MANUAL-MIB
+NS-VPN-MON.mib         NETSCREEN-VPN-MON-MIB
+NS-VPN-PH1.mib         NETSCREEN-VPN-PHASEONE-MIB
+NS-VPN-PH2.mib         NETSCREEN-VPN-PHASETWO-MIB
+NS-VPN-USR.mib         NETSCREEN-VPN-USER-MIB
+NS-VR-BGP4.mib         NETSCREEN-VR-BGP4-MIB
+NS-VR.mib              NETSCREEN-VR-MIB
+NS-VR-OSPF.mib         NETSCREEN-VR-OSPF-MIB
+NS-VR-RIP.mib          NETSCREEN-VR-RIPv2-MIB
+NS-VSYS.mib            NETSCREEN-VSYS-MIB
+NS-ZONE.mib            NETSCREEN-ZONE-MIB
diff --git a/snmp-mibs-downloader/snmp-mibs-downloader.conf b/snmp-mibs-downloader/snmp-mibs-downloader.conf

index 921327358d9180712fe8c7211bcf8b9b58f00a66..32f5439d26c74b535b7ea4645bca5ce3593330f6 100644 (file)
--- a/snmp-mibs-downloader/snmp-mibs-downloader.conf
+++ b/snmp-mibs-downloader/snmp-mibs-downloader.conf
@@ -1,4 +1,4 @@
-# Master configuarion for mib-downloader
+# Master configuarion for snmp-mibs-downloader
  #
  BASEDIR=/var/lib/snmp/mibs
  AUTOLOAD="rfc ianarfc iana"
diff --git a/snmp/snmp.conf b/snmp/snmp.conf

new file mode 100644 (file)

index 0000000..22fa775
--- /dev/null
+++ b/snmp/snmp.conf
@@ -0,0 +1,10 @@
+# As the snmp packages come without MIB files due to license reasons, loading
+# of MIBs is disabled by default. If you added the MIBs you can reenable
+# loading them by commenting out the following line.
+mibs :
+
+# If you want to globally change where snmp libraries, commands and daemons
+# look for MIBS, change the line below. Note you can set this for individual
+# tools with the -M option or MIBDIRS environment variable.
+#
+# mibdirs /usr/share/snmp/mibs:/usr/share/snmp/mibs/iana:/usr/share/snmp/mibs/ietf
diff --git a/sound/events/mate-battstat_applet.soundlist b/sound/events/mate-battstat_applet.soundlist

index ff7c84cf2ccec3a208465f3fbefa3435bc038fa0..fe88c2cc86e2551ef65ff97af099fba59b373df6 100644 (file)
--- a/sound/events/mate-battstat_applet.soundlist
+++ b/sound/events/mate-battstat_applet.soundlist
@@ -1,5 +1,4 @@
  [__section_info__]
-description=Battery Status Utility
  description[af]=Batterystatus-nutsprogram
  description[am]=የ ባትሪው የ ተለያየ ሁኔታ
  description[ar]=أداة حالة البطارية
@@ -105,223 +104,10 @@ description[xh]=Isixhobo soBume beBhetri
  description[zh_CN]=电池状态工具
  description[zh_HK]=電池狀態公用程式
  description[zh_TW]=電池狀態公用程式
+description=Battery Status Utility
  
  [LowBattery]
-file=
-description=Battery power low
-description[af]=Battery amper pap
-description[am]=የ ባትሪው ሐይል ዝቅተኛ ነው 
-description[ar]=طاقة البطارية منخفضة
-description[as]=বেটাৰিৰ ক্ষমতা কম
-description[ast]=Batería baxa
-description[az]=Batareya həcmi alçaqdır
-description[be]=Мала энергіі ў батарэі
-description[bg]=Ниска мощност на батерията
-description[bn]=ব্যাটারির ক্ষমতা কম
-description[bn_IN]=ব্যাটারির ক্ষমতা কম
-description[br]=Izel youll ar pod-tredan
-description[bs]=Baterija skoro prazna
-description[ca]=Bateria amb càrrega baixa
-description[ca@valencia]=Bateria amb càrrega baixa
-description[cmn]=電池電量過低
-description[crh]=Pil gücü zayıf
-description[cs]=Téměř vybité baterie
-description[cy]=Mae pŵer y batri'n isel
-description[da]=Batteriladning er lav
-description[de]=Akkuladezustand kritisch
-description[dz]=འཕྲུལ་ལྟོའི་ནུས་ཤུགས་དམའ་བས།
-description[el]=Χαμηλό φορτίο μπαταρίας
-description[en_AU]=Battery power low
-description[en_CA]=Battery power low
-description[en_GB]=Battery power low
-description[eo]=Bateria energio malalta
-description[es]=Carga de la batería baja
-description[es_AR]=Carga de la batería baja
-description[es_CL]=Carga de la batería baja
-description[es_CO]=Carga de la batería baja
-description[es_CR]=Carga de la batería baja
-description[es_DO]=Carga de la batería baja
-description[es_EC]=Carga de la batería baja
-description[es_ES]=Carga de la batería baja
-description[es_MX]=Carga de la batería baja
-description[es_NI]=Carga de la batería baja
-description[es_PA]=Carga de la batería baja
-description[es_PE]=Carga de la batería baja
-description[es_PR]=Carga de la batería baja
-description[es_SV]=Carga de la batería baja
-description[es_UY]=Carga de la batería baja
-description[es_VE]=Carga de la batería baja
-description[et]=Aku hakkab tühjaks saama
-description[eu]=Bateria gutxi
-description[fa]=برق باتری کم است
-description[fi]=Virta vähissä
-description[fr]=Batterie faible
-description[gl]=Enerxía da batería baixa
-description[gu]=વીજકોષની કાર્યત્વરા ઓછી છે
-description[he]=עצמת הסוללה נמוכה
-description[hi]=बैटरी पावर कम
-description[hr]=Baterija slaba
-description[hu]=Az akkumulátor töltöttsége alacsony
-description[hy]=Մարտկոցը լիցքաթափված է 
-description[id]=Daya baterai lemah
-description[ie]=Batterie ea exhaustet
-description[is]=Lítil hleðsla á rafhlöðu
-description[it]=Batteria quasi scarica
-description[ja]=バッテリの残量が少くなっています
-description[ka]=დაბალი ძაბვა
-description[kn]=ಕೆಳಮಟ್ಟದಲ್ಲಿರುವ ಬ್ಯಾಟರಿ ವಿದ್ಯುಚ್ಚಕ್ತಿ
-description[ko]=배터리 전력이 부족합니다
-description[ku]=Hêza bataryayê qels e
-description[ky]=Батарея заряды толук түгөндү
-description[lt]=Baterija beveik išsikrovusi
-description[lv]=Baterijas enerģija zema
-description[mai]=बैटरी पावर कम
-description[mg]=Lefy ny herin'ny vaton'aratra
-description[mk]=Батеријата е слаба
-description[ml]=ബാറ്ററി ചാര്‍ജ്ജ് വളരെ കുറവ്
-description[mn]=Зай цэнэг хэт бага байна
-description[mr]=बॅटरी ऊर्जा कमी
-description[ms]=Kuasa bateri rendah
-description[nb]=Lav strømstyrke
-description[ne]=ब्याट्री पावर न्यून
-description[nl]=Accu bijna leeg
-description[nn]=Batteriet er nesten tomt
-description[oc]=Batariá febla
-description[or]=ବ୍ଯାଟେରୀ  ବିଦ୍ଯୁତ କମ ଅଛି
-description[pa]=ਬੈਟਰੀ ਪਾਵਰ ਘੱਟ ਹੈ
-description[pl]=Akumulator jest na wyczerpaniu
-description[pt]=Energia da bateria em baixo
-description[pt_BR]=Bateria fraca
-description[ro]=Acumulator pe terminate
-description[ru]=Батарея разряжена
-description[si]=වියළි කොෂ බලය අවම වී ඇත
-description[sk]=Batéria je slabá
-description[sl]=Napetost baterije je nizka
-description[sq]=Ngarkesë e ulët e baterisë
-description[sr]=Батерија је слаба
-description[sr@latin]=Baterija slaba
-description[sv]=Låg batteriladdning
-description[ta]=மின்கலத்தின் சக்தி குறைவாக உள்ளது
-description[te]=తక్కువ బాటరీ శక్తి
-description[th]=แบตเตอรี่ใกล้หมด
-description[tr]=Pil gücü zayıf
-description[ug]=باتارېيىدە توك ئاز قالدى
-description[uk]=Акумулятор розряджений
-description[ur]=بیٹری کی توانائی پست ہے
-description[uz]=Zaryad kam
-description[vi]=Pin thấp
-description[wa]=Li batreye est flåwe
-description[xh]=Amandla ebhetri asezantsi
-description[zh_CN]=电池电量低
-description[zh_HK]=電池電量過低
-description[zh_TW]=電池電量過低
+file=description=Battery power low
  
  [BatteryFull]
-file=
-description=Battery fully re-charged
-description[af]=Battery ten volle gelaai
-description[am]=ባትሪው በሙሉ እንደገና-ሞልቷል 
-description[ar]=أُعيد شحن البطارية بالكامل
-description[as]=বেটাৰি সম্পূৰ্ণৰূপে চাৰ্জ কৰা হৈছে
-description[ast]=Batería llena
-description[az]=Batareya tamamilə dolduruldu
-description[be]=Батарэя цалкам перанасілкована
-description[bg]=Батерията е напълно презаредена
-description[bn]=ব্যাটারি সম্পূর্ণরূপে চার্জ করা হয়েছে
-description[bn_IN]=ব্যাটারি সম্পূর্ণরূপে চার্জ করা হয়েছে
-description[br]=Pod-tredan adleuniet penn da benn
-description[bs]=Baterija je napunjena
-description[ca]=La bateria està completament carregada
-description[ca@valencia]=La bateria està completament carregada
-description[cmn]=電池電量全滿
-description[crh]=Pil tamamen doldu
-description[cs]=Baterie jsou plně nabity
-description[cy]=Mae'r batri wedi ail-drydanu’n llwyr
-description[da]=Batteriet er fuldt opladet
-description[de]=Akku voll aufgeladen
-description[dz]=འཕྲུལ་ལྟོའི་ནུས་ཤུགས་གངམ་སྦེ་རང་ ལོག་བླུགས་ཅི།
-description[el]=Η μπαταρία είναι πλήρως φορτισμένη
-description[en_AU]=Battery fully re-charged
-description[en_CA]=Battery fully re-charged
-description[en_GB]=Battery fully re-charged
-description[eo]=Baterio plene reŝargita
-description[es]=Batería recargada completamente
-description[es_AR]=Batería recargada completamente
-description[es_CL]=Batería recargada completamente
-description[es_CO]=Batería recargada completamente
-description[es_CR]=Batería recargada completamente
-description[es_DO]=Batería recargada completamente
-description[es_EC]=Batería recargada completamente
-description[es_ES]=Batería recargada completamente
-description[es_MX]=Batería recargada completamente
-description[es_NI]=Batería recargada completamente
-description[es_PA]=Batería recargada completamente
-description[es_PE]=Batería recargada completamente
-description[es_PR]=Batería recargada completamente
-description[es_SV]=Batería recargada completamente
-description[es_UY]=Batería recargada completamente
-description[es_VE]=Batería recargada completamente
-description[et]=Aku on täis laetud
-description[eu]=Bateria erabat kargatuta
-description[fa]=باتری کاملاً پر شد
-description[fi]=Akku on täynnä
-description[fr]=La batterie est totalement rechargée
-description[gl]=Batería completamente recargada
-description[gu]=વીજકોષ પૂરેપૂરો વીજભારિત છે
-description[he]=סוללה נטענה מחדש לגמרי
-description[hi]=बैटरी पूर्णतः पुनः चार्ज
-description[hr]=Baterija u potpunosti napunjena
-description[hu]=Az akkumulátor teljesen feltöltődött
-description[hy]=Մարտկոցը ամբողջությամբ վերալիցքավորված է 
-description[id]=Baterai sudah penuh
-description[ie]=Batterie sta complet re-chargeat
-description[is]=Rafhlaðan er nú fullhlaðin
-description[it]=Batteria completamente ricaricata
-description[ja]=充電が完了しました
-description[ka]=ელემენტი ბოლომდეა დამუხტული
-description[kn]=ಸಂಪೂರ್ಣವಾಗಿ ಮರು-ಚಾರ್ಜ್ ಆದಂತಹ ಬ್ಯಾಟರಿ
-description[ko]=배터리가 완전히 충전되었습니다!
-description[ku]=Batarya bi tevahî şarj bû
-description[ky]=Батарея толук заряддалды
-description[lt]=Baterija yra pilnai įkrauta.
-description[lv]=Baterija pilnīgi uzlādēta
-description[mai]=बैटरी पूर्णतः पुनः चार्ज
-description[mg]=Voafahana tanteraka ny vaton'aratra
-description[mk]=Батеријата е целосно наполнета
-description[ml]=ബാറ്ററി ചാര്‍ജ്ജ് നിറഞ്ഞു
-description[mn]=Зай дахин бүрэн цэнэглэгдлээ!
-description[mr]=बॅटरी पूर्णतः पुनःभारित
-description[ms]=Bateri dicas-semula sepenuhnya
-description[nb]=Batteriet er fullt oppladet
-description[ne]=ब्याट्री पूरा रिचार्ज भयो
-description[nl]=Accu is volledig opgeladen
-description[nn]=Batteriet er fullt opplada
-description[oc]=Batariá completament recargada
-description[or]=ବ୍ଯାଟେରୀ  ପୂର୍ଣ୍ଣ ଭାବରେ ପୁନଃ-ଚାର୍ଜ ହୋଇଛି
-description[pa]=ਬੈਟਰੀ ਪੂਰੀ ਮੁੜ-ਚਾਰਜ ਹੋ ਗਈ ਹੈ
-description[pl]=Akumulator jest w pełni naładowany
-description[pt]=Bateria completamente recarregada
-description[pt_BR]=A bateria está totalmente recarregada
-description[ro]=Acumulator complet reîncărcat
-description[ru]=Батарея полностью заряжена
-description[si]=වියළි කෝෂය සම්පූර්ණයෙන්ම බලගැන්වී ඇත
-description[sk]=Batéria je plne nabitá
-description[sl]=Baterija je znova povsem napolnjena
-description[sq]=Bateria e ringarkuar plot
-description[sr]=Батерија је потпуно напуњена
-description[sr@latin]=Baterija u potpunosti napunjena
-description[sv]=Batteriet helt uppladdat
-description[ta]=மின்கலம் மீண்டும் முழுமையாக ஏற்றப்பட்டுள்ளது.
-description[te]=బాటరీ పూర్తిగా తిరిగి ఛార్జ్ చేయబడినది
-description[th]=แบตเตอรี่อัดเต็มแล้ว
-description[tr]=Pil tamamen doldu
-description[ug]=باتارېيە زەرەتلىنىپ بولدى
-description[uk]=Акумулятор повністю заряджено
-description[ur]=بیٹری مکمل طور پر دوبارہ چارج ہوگئی ہے
-description[uz]=Batareya to'la zaryad oldi
-description[vi]=Pin đã được sạc đầy.
-description[wa]=Li batreye est tcherdjeye a make
-description[xh]=Ibhetri sele igcwaliswe ngokupheleleyo kwakhona
-description[zh_CN]=电池已充满
-description[zh_HK]=電池電量全滿
-description[zh_TW]=電池電量全滿
+file=description=Battery fully re-charged
diff --git a/speech-dispatcher/modules/baratinoo.conf b/speech-dispatcher/modules/baratinoo.conf

new file mode 100644 (file)

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

index c454b669aef28c7ba6dbc10b27297832a240d097..1cbec06b96888fb6465e52a4e565abcc7cb04d6d 100644 (file)
--- a/speech-dispatcher/modules/cicero.conf
+++ b/speech-dispatcher/modules/cicero.conf
@@ -28,3 +28,20 @@
  # See speechd.conf for information where debugging information is stored
  
  #Debug 0
+
+
+# Copyright (C) 2006 Olivier BERT <obert01@mistigri.org>
+# Copyright (C) 2006 Brailcom, o.p.s
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/dtk-generic.conf b/speech-dispatcher/modules/dtk-generic.conf

index f485e938716a7ddbf645c1242c78dbe8f686c9a0..76f9ec23d7984db11c80e06d8668d63a4e27f862 100644 (file)
--- a/speech-dispatcher/modules/dtk-generic.conf
+++ b/speech-dispatcher/modules/dtk-generic.conf
@@ -28,6 +28,8 @@ GenericExecuteSynth \
  "echo \"[:n$VOICE][:ra $RATE][:dv ap $PITCH]\" >$TMPDIR/dtk-speak.txt \
  && echo \'$DATA\' | fmt >>$TMPDIR/dtk-speak.txt && say -fi $TMPDIR/dtk-speak.txt"
  
+GenericCmdDependency "say"
+
  # GenericStripPunctChars is a list (enclosed in doublequotes) of
  # all the characters that should be replaced by whitespaces in
  # order not to be badly handled by the output module or misinterpreted
@@ -82,3 +84,19 @@ GenericPitchMultiply 175
  
  # Debug 0
  
+
+
+# Copyright (C) 2004-2008 Brailcom, o.p.s
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/epos-generic.conf b/speech-dispatcher/modules/epos-generic.conf

index 8c327e378238ca394e36e12de2a3b1c90b0f6d8e..0bf0365e1df927ed2a8d3fee6023799b0af4018e 100644 (file)
--- a/speech-dispatcher/modules/epos-generic.conf
+++ b/speech-dispatcher/modules/epos-generic.conf
@@ -22,6 +22,8 @@ GenericExecuteSynth \
  "epos-say -o --language $LANGUAGE --voice $VOICE --init_f $PITCH --init_t $RATE \
  \'$DATA\' | sed -e /unknown*/d >$TMPDIR/epos-said.wav && play $TMPDIR/epos-said.wav >/dev/null"
  
+GenericCmdDependency "epos-say"
+
  # GenericStripPunctChars is a list (enclosed in doublequotes) of
  # all the characters that should be replaced by whitespaces in
  # order not to be badly handled by the output module or misinterpreted
@@ -78,3 +80,19 @@ GenericPitchMultiply 100
  # Debug turns debugging on or off
  # See speechd.conf for information where debugging information is stored
  # Debug 0
+
+
+# Copyright (C) 2003-2008 Brailcom, o.p.s
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/espeak-generic.conf b/speech-dispatcher/modules/espeak-generic.conf

index d76c03ad044b6c47a779051ba4195a00caf1c711..2300357e5ed19557d98a4a6f46bcab807903090c 100644 (file)
--- a/speech-dispatcher/modules/espeak-generic.conf
+++ b/speech-dispatcher/modules/espeak-generic.conf
@@ -22,6 +22,8 @@
  GenericExecuteSynth \
  "echo \'$DATA\' | espeak -w $TMPDIR/espeak.wav -v $VOICE -s $RATE -a $VOLUME -p $PITCH $PUNCT --stdin && $PLAY_COMMAND $TMPDIR/espeak.wav"
  
+GenericCmdDependency "espeak"
+
  # The following three items control punctuation levels None, Some, and All.
  # Each of these values will be substituted into the $PUNCT variable depending
  # on the value passed to speech dispatcher from applications.
@@ -121,3 +123,20 @@ GenericVolumeForceInteger   1
  # Debug turns debugging on or off
  # See speechd.conf for information where debugging information is stored
  Debug 0
+
+
+# Copyright (C) 2006-2008 Brailcom, o.p.s
+# Copyright (C) 2006 Gary Cramblitt <garycramblitt@comcast.net>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/espeak-mbrola-generic.conf b/speech-dispatcher/modules/espeak-mbrola-generic.conf

index a50df5097137a0018c187bfad734225b2ebc7c16..b5fa86b5ddd833a6f91cde4fd866234f18cea19c 100644 (file)
--- a/speech-dispatcher/modules/espeak-mbrola-generic.conf
+++ b/speech-dispatcher/modules/espeak-mbrola-generic.conf
@@ -18,15 +18,18 @@
  # can modify this value, see other parameters).
  # The command can be split into more lines, if necessary, using '\'.
  GenericExecuteSynth \
-"echo \'$DATA\' | espeak -v mb-$VOICE -s $RATE -p $PITCH $PUNCT -q --stdin --pho | mbrola -v $VOLUME -e /usr/share/mbrola/$VOICE/$VOICE - -.au | $PLAY_COMMAND
+"echo \'$DATA\' | espeak -v mb-$VOICE -s $RATE -p $PITCH $PUNCT -q --stdin --pho | mbrola -v $VOLUME -e /usr/share/mbrola/$VOICE/$VOICE - -.au | $PLAY_COMMAND"
+
+GenericCmdDependency "espeak"
+GenericCmdDependency "mbrola"
  
  # The following three items control punctuation levels None, Some, and All.
  # Each of these values will be substituted into the $PUNCT variable depending
  # on the value passed to speech dispatcher from applications.
-# Note that if an empty string is specified, then $PUNCT will be blank 
+# Note that if an empty string is specified, then $PUNCT will be blank
  # which is a default situation for espeak.
- 
-GenericPunctNone " "
+
+GenericPunctNone ""
  GenericPunctSome "--punct=\"()[]{};:\""
  GenericPunctAll "--punct"
  
@@ -50,9 +53,13 @@ GenericLanguage                "de" "de" "utf-8"
  GenericLanguage                  "el" "el" "utf-8"
  GenericLanguage                  "en" "en" "utf-8"
  GenericLanguage                  "es" "es" "utf-8"
+GenericLanguage                  "et" "et" "utf-8"
+GenericLanguage                  "fa" "fa" "utf-8"
  GenericLanguage                  "fr" "fr" "utf-8"
-GenericLanguage                  "hr" "hr" "utf-8"
  GenericLanguage                  "hu" "hu" "utf-8"
+GenericLanguage                  "hr" "hr" "utf-8"
+GenericLanguage                  "id" "id" "utf-8"
+GenericLanguage                  "is" "is" "utf-8"
  GenericLanguage                  "it" "it" "utf-8"
  GenericLanguage                  "la" "la" "utf-8"
  GenericLanguage                  "nl" "nl" "utf-8"
@@ -60,57 +67,82 @@ GenericLanguage               "pl" "pl" "utf-8"
  GenericLanguage                  "pt" "pt" "utf-8"
  GenericLanguage                  "ro" "ro" "utf-8"
  GenericLanguage                  "sv" "sv" "utf-8"
-GenericLanguage                  "sw" "sw" "utf-8"
-GenericLanguage                  "gr" "gr" "utf-8"
-GenericLanguage                  "cr" "cr" "utf-8"
-GenericLanguage                  "hu" "hu" "utf-8"
-GenericLanguage                  "id" "id" "utf-8"
+GenericLanguage                  "tr" "tr" "utf-8"
+
+# Each voice is available if and only if the following files exist.
+# These files must be listed *before* the voices.
+
+VoiceFileDependency "/usr/share/mbrola/$VOICE/$VOICE"
+VoiceFileDependency "/usr/lib/x86_64-linux-gnu/espeak-data/voices/mb/mb-$VOICE"
  
  # AddVoice specifies which $VOICE string should be assigned to
  # each language and symbolic voice name. All the voices you want
  # to use must be specified here. This list will likely not be
  # up-to-date, please check eSpeak documentation and add the voices
-# you want to use. Or better use the native espeak module ('espeak'
-# not 'espeak-generic')
+# you want to use.
  
-AddVoice        "en"    "MALE1"                "en1"
-AddVoice        "en"    "MALE2"                "us2"
-AddVoice        "en"    "MALE3"                "us3"
-AddVoice        "en"    "FEMALE1"      "us1"
+AddVoice        "af"    "MALE1"        "af1"
+
+AddVoice        "cs"    "MALE1"                "cz2"
  
  AddVoice        "de"    "MALE1"         "de4"
  AddVoice        "de"    "MALE2"         "de6"
+AddVoice        "de"    "MALE3"         "de2"
  AddVoice        "de"    "FEMALE1"       "de5"
  AddVoice        "de"    "FEMALE2"       "de7"
+AddVoice        "de"    "FEMALE3"       "de3"
  
-AddVoice        "fr"    "MALE1"       "fr1"
-AddVoice        "fr"    "FEMALE1"     "fr4"
+AddVoice        "el"    "MALE1"        "gr1"
+AddVoice        "el"    "MALE2"        "gr2"
  
-AddVoice        "it"    "MALE1"                "it3"
-AddVoice        "it"    "FEMALE1"      "it4"
+AddVoice        "en"    "MALE1"                "en1"
+AddVoice        "en"    "MALE2"                "us2"
+AddVoice        "en"    "MALE3"                "us3"
+AddVoice        "en"    "FEMALE1"      "us1"
  
  AddVoice        "es"    "MALE1"                "es1"
  AddVoice        "es"    "MALE2"                "es2"
+AddVoice        "es"    "MALE3"        "mx1"
+AddVoice        "es"    "MALE4"        "mx2"
+AddVoice        "es"    "MALE5"        "vz1"
+
+AddVoice        "et"    "MALE1"         "ee1"
+
+AddVoice        "fa"    "MALE1"        "ir1"
+AddVoice        "fa"    "FEMALE1"       "ir2"
+
+AddVoice        "fr"    "MALE1"         "fr1"
+AddVoice        "fr"    "FEMALE1"       "fr4"
+
+AddVoice        "hu"    "MALE1"        "hu1"
+
+AddVoice        "hr"    "MALE1"        "cr1"
  
-AddVoice        "sw"    "MALE1"         "sw1"
-AddVoice        "sw"    "FEMALE1"      "sw2"
+AddVoice        "id"    "MALE1"        "id1"
  
-AddVoice        "gr"    "MALE1"        "gr1"
-AddVoice        "gr"    "MALE2"        "gr2"
+AddVoice        "is"    "MALE1"        "ic1"
+
+AddVoice        "it"    "MALE1"                "it3"
+AddVoice        "it"    "FEMALE1"      "it4"
+
+AddVoice        "la"    "MALE1"        "la1"
+
+AddVoice        "nl"    "MALE1"        "nl2"
+
+AddVoice        "pl"    "FEMALE1"       "pl1"
  
  AddVoice        "pt"    "MALE1"        "br1"
  AddVoice        "pt"    "MALE2"        "br3"
  AddVoice        "pt"    "FEMALE1"       "pt1"
+AddVoice        "pt"    "FEMALE2"       "br4"
  
-AddVoice        "cs"    "MALE1"                "cz2"
-AddVoice        "pl"    "FEMALE1"       "pl1"
  AddVoice        "ro"    "MALE1"                "ro1"
-AddVoice        "af"    "MALE1"        "af1"
-AddVoice        "cr"    "MALE1"        "cr1"
-AddVoice        "hu"    "MALE1"        "hu1"
-AddVoice        "la"    "MALE1"        "la1"
-AddVoice        "id"    "MALE1"        "id1"
-AddVoice        "nl"    "MALE1"        "nl2"
+
+AddVoice        "sv"    "MALE1"         "sw1"
+AddVoice        "sv"    "FEMALE1"      "sw2"
+
+AddVoice        "tr"    "MALE1"         "tr1"
+AddVoice        "tr"    "FEMALE1"       "tr2"
  
  # These parameters set _rate_, _pitch_, and _volume_ conversion. This is
  # part of the core of the definition of this generic output
@@ -156,3 +188,22 @@ GenericVolumeForceInteger   0
  # Debug turns debugging on or off
  # See speechd.conf for information where debugging information is stored
  Debug 0
+
+
+# Copyright (C) 2008-2010 Brailcom, o.p.s
+# Copyright (C) 2014 Luke Yelavich <themuso@ubuntu.com>
+# Copyright (C) 2018 Samuel Thibault <samuel.thibault@ens-lyon.org>
+# Copyright (C) 2018 Didier Spaier <didier@slint.fr>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/espeak-ng-mbrola-generic.conf b/speech-dispatcher/modules/espeak-ng-mbrola-generic.conf

new file mode 100644 (file)

index 0000000..427e51b
--- /dev/null
+++ b/speech-dispatcher/modules/espeak-ng-mbrola-generic.conf
@@ -0,0 +1,269 @@
+# Espeak mbrola output module is based on the generic plugin for Speech
+# Dispatcher. It means there is no code written explicitly for
+# this plugin, all the specifics are handled in this configuration
+# and we call a simple command line client to perform the actual
+# synthesis. Use this config file with the sd_generic output module.
+#
+# IMPORTANT: The audio output method relies on an audio playback
+# utility (play, aplay, paplay for OSS, ALSA or Pulse)
+# being installed. If this is not the case, consider installing it
+# or replace the $PLAY_COMMAND string in the GenericExecuteString below
+# with play, paplay or similar.
+#
+# GenericExecuteSynth is the shell command that should be
+# executed in order to say some message. This command must
+# stop saying the message on SIGKILL, otherwise it's useless.
+# You can use the variables $LANGUAGE, $VOICE, $PITCH and $RATE
+# which will be substituted for the appropriate value (you
+# can modify this value, see other parameters).
+# The command can be split into more lines, if necessary, using '\'.
+GenericExecuteSynth \
+"echo \'$DATA\' | espeak-ng -v mb-$VOICE -s $RATE -p $PITCH $PUNCT -q --stdin --pho | mbrola -v $VOLUME -e /usr/share/mbrola/$VOICE/$VOICE - -.au | $PLAY_COMMAND"
+
+# Alternatively you can shorten the command like below, which makes it
+# work directly with any audio playback utility, but then you won't
+# be able to change the volume from the client application:
+# GenericExecuteSynth \
+# "echo \'$DATA\' | espeak-ng -v mb-$VOICE -s $RATE -p $PITCH $PUNCT -stdin"
+
+GenericCmdDependency "espeak-ng"
+GenericCmdDependency "mbrola"
+
+# The following three items control punctuation levels None, Some, and All.
+# Each of these values will be substituted into the $PUNCT variable depending
+# on the value passed to speech dispatcher from applications.
+# Note that if an empty string is specified, then $PUNCT will be blank
+# which is a default situation for espeak.
+
+GenericPunctNone ""
+GenericPunctSome "--punct=\"()[]{};:\""
+GenericPunctAll "--punct"
+
+# GenericStripPunctChars is a list (enclosed in doublequotes) of
+# all the characters that should be replaced by whitespaces in
+# order not to be badly handled by the output module or misinterpreted
+# by shell.
+# GenericStripPunctChars  ""
+
+# If the language you need to pass in $LANG is different
+# from the standard ISO language code, you can specify
+# which string to use instead. If you wish to use
+# other than ISO charset for the specified language,
+# you can add it's name (as accepted by iconv) as a
+# third parameter in doublequotes.
+
+# To be completed
+GenericLanguage                  "af" "af" "utf-8"
+GenericLanguage                  "cs" "cs" "utf-8"
+GenericLanguage                  "de" "de" "utf-8"
+GenericLanguage                  "el" "el" "utf-8"
+GenericLanguage                  "en" "en" "utf-8"
+GenericLanguage                  "es" "es" "utf-8"
+GenericLanguage                  "et" "et" "utf-8"
+GenericLanguage                  "fa" "fa" "utf-8"
+GenericLanguage                  "fr" "fr" "utf-8"
+GenericLanguage                  "hu" "hu" "utf-8"
+GenericLanguage                  "hr" "hr" "utf-8"
+GenericLanguage                  "id" "id" "utf-8"
+GenericLanguage                  "is" "is" "utf-8"
+GenericLanguage                  "it" "it" "utf-8"
+GenericLanguage                  "la" "la" "utf-8"
+GenericLanguage                  "lt" "lt" "utf-8"
+GenericLanguage                  "nl" "nl" "utf-8"
+GenericLanguage                  "pl" "pl" "utf-8"
+GenericLanguage                  "pt" "pt" "utf-8"
+GenericLanguage                  "ro" "ro" "utf-8"
+GenericLanguage                  "sv" "sv" "utf-8"
+GenericLanguage                  "tr" "tr" "utf-8"
+
+# Each voice is available if and only if the following files exist.
+# These files must be listed *before* the voices.
+
+VoiceFileDependency "/usr/share/mbrola/$VOICE/$VOICE"
+VoiceFileDependency "/usr/lib/x86_64-linux-gnu/espeak-ng-data/voices/mb/mb-$VOICE"
+
+# AddVoice specifies which $VOICE string should be assigned to
+# each language and symbolic voice name. All the voices you want
+# to use must be specified here. This list will likely not be
+# up-to-date, please check eSpeak NG documentation and add the voices
+# you want to use.
+# All MBROLA voices for which a phoneme translation from espeak-ng to
+# MBROLA as of 12 October 2018 are listed, some commented with the
+# rationale to not include them by default. You still can ship or use
+# the commented voices if you uncomment the corresponding line.
+
+# As of Friday 12 October 2018 theses mbrola voices not yet supported
+# by espeak-ng's phonemes translation to mbrola in git are:
+# bz1: Breton Female (25.0Mb)    Jean Pierre Messager
+# hb1: Hebrew Male (3.4Mb)    Yoram Meron
+# hb2: Hebrew Female (5.6Mb)    Esther Raizen
+# hn1: Korean Male (9.9Mb)    Kyongsok Gim
+# thus they are not listed below.
+# The language code in this list is the ISO 639-1 code.
+
+AddVoice "af" "MALE1" "af1"
+
+AddVoice "ar" "MALE1" "ar1"
+AddVoice "ar" "MALE2" "ar2"
+
+AddVoice "zh" "FEMALE1" "cn1"
+
+AddVoice "cs" "FEMALE1" "cz1"
+AddVoice "cs" "MALE1" "cz2"
+
+AddVoice "de" "FEMALE1" "de1"
+AddVoice "de" "MALE1" "de2"
+AddVoice "de" "FEMALE2" "de3"
+AddVoice "de" "MALE2" "de4"
+AddVoice "de" "FEMALE3" "de5"
+AddVoice "de" "MALE1" "de6"
+AddVoice "de" "FEMALE3" "de7"
+AddVoice "de" "MALE3" "de8"
+
+AddVoice "el" "MALE1" "gr1"
+AddVoice "el" "MALE2" "gr2"
+
+AddVoice "en" "MALE1" "en1"
+AddVoice "en" "FEMALE1" "us1"
+AddVoice "en" "MALE2" "us2"
+AddVoice "en" "MALE3" "us3"
+
+AddVoice "es" "MALE1" "es1"
+AddVoice "es" "MALE2" "es2"
+AddVoice "es" "FEMALE1" "es3"
+AddVoice "es" "MALE3" "es4"
+AddVoice "es" "MALE1" "mx1"
+AddVoice "es" "MALE2" "mx2"
+AddVoice "es" "MALE1" "vz1"
+
+AddVoice "et" "MALE1" "ee1"
+
+AddVoice "fa" "MALE1" "ir1"
+AddVoice "fa" "FEMALE1" "ir2"
+
+AddVoice "fr" "MALE1" "ca1"
+AddVoice "fr" "MALE2" "ca2"
+AddVoice "fr" "MALE1" "fr1"
+AddVoice "fr" "FEMALE1" "fr2"
+AddVoice "fr" "MALE3" "fr3"
+AddVoice "fr" "FEMALE2" "fr4"
+AddVoice "fr" "MALE3" "fr5"
+AddVoice "fr" "MALE3" "fr6"
+AddVoice "fr" "MALE3" "fr7"
+
+AddVoice "hi" "MALE1" "in1"
+AddVoice "hi" "MALE2" "in2"
+
+AddVoice "hu" "MALE1" "hu1"
+
+AddVoice "hr" "MALE1" "cr1"
+
+AddVoice "id" "MALE1" "id1"
+
+AddVoice "is" "MALE1" "ic1"
+
+AddVoice "it" "MALE1" "it1"
+AddVoice "it" "FEMALE1" "it2"
+AddVoice "it" "MALE2" "it3"
+AddVoice "it" "FEMALE2" "it4"
+
+AddVoice "jp" "MALE1" "jp1"
+AddVoice "jp" "FEMALE1" "jp2"
+AddVoice "jp" "FEMALE2" "jp3"
+
+AddVoice "la" "MALE1" "la1"
+
+AddVoice "lt" "MALE1" "lt1"
+AddVoice "lt" "MALE2" "lt2"
+
+Addvoice "ms" "FEMALE1" "ma1"
+
+# nl1 has a very limited set of diphones and is usable only for reading
+# numbers. Uncomment the next line if you want it.
+# AddVoice "nl" "CHILD-MALE" "nl1"
+AddVoice "nl" "MALE1" "nl2"
+AddVoice "nl" "FEMALE1" "nl3"
+
+AddVoice "mi" "MALE1" "nz1"
+
+AddVoice "pl" "FEMALE1" "pl1"
+
+AddVoice "pt" "MALE1" "br1"
+AddVoice "pt" "MALE2" "br2"
+AddVoice "pt" "MALE3" "br3"
+AddVoice "pt" "FEMALE1" "br4"
+AddVoice "pt" "FEMALE2" "pt1"
+
+AddVoice "ro" "MALE1" "ro1"
+
+AddVoice "sw" "MALE1" "sw1"
+AddVoice "sw" "FEMALE1" "sw2"
+
+AddVoice "te" "FEMALE1" "tl1"
+
+AddVoice "tr" "MALE1" "tr1"
+AddVoice "tr" "FEMALE1" "tr2"
+
+# These parameters set _rate_, _pitch_, and _volume_ conversion. This is
+# part of the core of the definition of this generic output
+# module for this concrete synthesizer, it's not intended to
+# be modified by common users.
+# The resulting rate (or pitch) has the form:
+#       (speechd_rate * GenericRateMultiply) + GenericRateAdd
+# while speechd_rate is a value between -100 (lowest) and +100 (highest)
+# You have to define some meaningful conversion for each synthesizer
+
+# Here's the mapping from SSIP (Speech Dispatcher) to ESpeak (v1.10):
+#
+#           SSIP Range  SSIP Default    ESpeak/MBROLA Range ESpeak Default
+#           ----------- ------------    ------------         --------------
+# Rate      -100 to 100     0           80 to 320       160
+# Pitch     -100 to 100     0            0 to 99         50
+# Volume    -100 to 100     0            0 to 2          --
+#
+# The SSIP defaults are actually controlled via DefaultRate, DefaultPitch, and
+# DefaultVolume in the speechd.conf file.
+
+GenericRateAdd          160
+GenericPitchAdd         50
+GenericVolumeAdd        1
+
+# (These values are multiplied by 100, because DotConf currently
+# doesn't support floats. So you can write 0.85 as 85 and so on.)
+
+GenericRateMultiply     160
+GenericPitchMultiply    50
+GenericVolumeMultiply   1
+
+# If the client program can't handle floats, you will have to
+# use these two options to force integers as the parameters
+# 1 means force integers, 0 means do nothing (write floats).
+
+GenericRateForceInteger     1
+GenericPitchForceInteger    1
+GenericVolumeForceInteger   0
+
+# Note that SSIP rates < -50 are spoken at -50.
+
+# Debug turns debugging on or off
+# See speechd.conf for information where debugging information is stored
+Debug 0
+
+
+# Copyright (C) 2008-2010 Brailcom, o.p.s
+# Copyright (C) 2014 Luke Yelavich <themuso@ubuntu.com>
+# Copyright (C) 2018 Samuel Thibault <samuel.thibault@ens-lyon.org>
+# Copyright (C) 2018 Didier Spaier <didier@slint.fr>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/espeak-ng.conf b/speech-dispatcher/modules/espeak-ng.conf

index e8afa4cd8c3c0bcacc9b2d70aa3d401be79431e9..c9a71ca7533984154055f244e290051626a0bc74 100644 (file)
--- a/speech-dispatcher/modules/espeak-ng.conf
+++ b/speech-dispatcher/modules/espeak-ng.conf
@@ -52,5 +52,28 @@ EspeakAudioChunkSize 3000
  # Maximum number of samples to buffer in playback queue.
  EspeakAudioQueueMaxSize 441000
  
+# Whether to enable speech indexing
+EspeakIndexing 1
+
  # Debugging
  Debug 0
+
+
+# Copyright (C) 2007 Lukas Loehrer <listaddr1@gmx.net>
+# Copyright (C) 2007-2008 Brailcom, o.p.s
+# Copyright (C) 2007 Gilles Casse <gcasse@oralux.org>
+# Copyright (C) 2011 Rui Batista <ruiandrebatista@gmail.com>
+# Copyright (C) 2011-2016 Luke Yelavich <themuso@themuso.com>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/espeak.conf b/speech-dispatcher/modules/espeak.conf

index e8afa4cd8c3c0bcacc9b2d70aa3d401be79431e9..749802cc8e42ab4c3cfefdbd7be0675f33b752c7 100644 (file)
--- a/speech-dispatcher/modules/espeak.conf
+++ b/speech-dispatcher/modules/espeak.conf
@@ -52,5 +52,28 @@ EspeakAudioChunkSize 3000
  # Maximum number of samples to buffer in playback queue.
  EspeakAudioQueueMaxSize 441000
  
+# Whether to enable speech indexing
+EspeakIndexing 1
+
  # Debugging
  Debug 0
+
+
+# Copyright (C) 2007 Lukas Loehrer <listaddr1@gmx.net>
+# Copyright (C) 2007-2008 Brailcom, o.p.s
+# Copyright (C) 2007 Gilles Casse <gcasse@oralux.org>
+# Copyright (C) 2011 Rui Batista <ruiandrebatista@gmail.com>
+# Copyright (C) 2011 Luke Yelavich <themuso@themuso.com>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/festival.conf b/speech-dispatcher/modules/festival.conf

index 9efc942bdfe6b564b5b490565b193da12095270b..bf38bc0280e1d4372afc372897147ffa947de32e 100644 (file)
--- a/speech-dispatcher/modules/festival.conf
+++ b/speech-dispatcher/modules/festival.conf
@@ -74,3 +74,20 @@ Debug 0
  # for debugging purposes. They are numbered in order starting from 0.
  
  # FestivalDebugSaveOutput 0
+
+
+# Copyright (C) 2003-2008 Brailcom, o.p.s
+# Copyright (C) 2007 Gilles Casse <gcasse@oralux.org>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/flite.conf b/speech-dispatcher/modules/flite.conf

index be20924cacd005b6d1dbaf94013b44288cf19f3b..ff34901069857bdf270ef67cc902d7fbb638f2de 100644 (file)
--- a/speech-dispatcher/modules/flite.conf
+++ b/speech-dispatcher/modules/flite.conf
@@ -13,3 +13,19 @@ FliteDelimiters        ".?!;"
  # should be stored (note that the log is overwritten each time
  # the module starts)
  # DebugFile "/tmp/debug-flite"
+
+
+# Copyright (C) 2003-2008 Brailcom, o.p.s
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/ibmtts.conf b/speech-dispatcher/modules/ibmtts.conf

index 0d88e3d02bb9b2a13a703351e8264ce155fa613d..93f14ff54daf7ec4d3a4601647f13ae1f2bc3b74 100644 (file)
--- a/speech-dispatcher/modules/ibmtts.conf
+++ b/speech-dispatcher/modules/ibmtts.conf
@@ -205,3 +205,24 @@ IbmttsKeySubstitution "en"  "X"         "capital X "
  IbmttsKeySubstitution "en"  "Y"         "capital Y "
  IbmttsKeySubstitution "en"  "Z"         "capital Z "
  
+
+
+# Copyright (C) 2006 Gary Cramblitt <garycramblitt@comcast.net>
+# Copyright (C) 2007-2008 Brailcom, o.p.s
+# Copyright (C) 2007 Lukas Loehrer <listaddr1@gmx.net>
+# Copyright (C) 2007-2013 Gilles Casse <gcasse@oralux.org>
+# Copyright (C) 2010 Christopher Brannon <cmbrannon79@gmail.com>
+# Copyright (C) 2016 Luke Yelavich <themuso@themuso.com>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/ivona.conf b/speech-dispatcher/modules/ivona.conf

index 372fc53e7c0f94bcdc15a0ef9c64d0cc3cdca138..261820e1eb39c7aefb7e09ba88b08c58b39d65dd 100644 (file)
--- a/speech-dispatcher/modules/ivona.conf
+++ b/speech-dispatcher/modules/ivona.conf
@@ -37,3 +37,19 @@ IvonaSpeakerLanguage "pl"
  #Punctuation for "some"
  #IvonaPunctuationSome "()"
  
+
+
+# Copyright (C) 2008 Brailcom, o.p.s
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/kali.conf b/speech-dispatcher/modules/kali.conf

new file mode 100644 (file)

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

index 33016376a6cecfca5e82e71903df274c1cabd04f..dc64d96e5b049afc1a5112a112f63d4f8ebc956e 100644 (file)
--- a/speech-dispatcher/modules/llia_phon-generic.conf
+++ b/speech-dispatcher/modules/llia_phon-generic.conf
@@ -22,6 +22,9 @@ GenericExecuteSynth \
  -e -I LIAPHON/data/noarch/initfile.lia (directory with the voice) $VOICE \
  $TMPDIR/llia_phon.txt -.au | $PLAY_COMMAND -t au - >/dev/null"
  
+GenericCmdDependency "llia_phon"
+GenericCmdDependency "mbrola"
+
  # AddVoice specifies which $VOICE string should be assigned to
  # each language and symbolic voice name. All the voices you want
  # to use must be specified here.
@@ -64,3 +67,19 @@ GenericPitchMultiply 100
  # should be stored (note that the log is overwritten each time
  # the module starts)
  # DebugFile "/tmp/debug-llia-phon-generic"
+
+
+# Copyright (C) 2004-2008 Brailcom, o.p.s
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/mary-generic.conf b/speech-dispatcher/modules/mary-generic.conf

new file mode 100644 (file)

index 0000000..93b05e0
--- /dev/null
+++ b/speech-dispatcher/modules/mary-generic.conf
@@ -0,0 +1,82 @@
+# The mary-generic output module is based on the generic plugin for Speech
+# Dispatcher. It means there is no code written explicitly for
+# this plugin, all the specifics are handled in this configuration
+# and we call a simple command line client to perform the actual
+# synthesis. Use this config file with the sd_generic output module.
+#
+# IMPORTANT: The audio output method relies on an audio playback
+# utility (play, aplay, paplay for OSS, ALSA or Pulse)
+# being installed. If this is not the case, consider installing it
+# or replace the $PLAY_COMMAND string in the GenericExecuteString below
+# with play, paplay or similar.
+#
+# GenericExecuteSynth is the shell command that should be
+# executed in order to say some message. This command must
+# stop saying the message on SIGKILL, otherwise it's useless.
+# You can use the variables $LANGUAGE, $VOICE, $PITCH and $RATE
+# which will be substituted for the appropriate value (you
+# can modify this value, see other parameters).
+# This line uses the command curl, so you might need to install
+# curl if it isn't already installed.
+# The command can be split into more lines, if necessary, using '\'.
+GenericExecuteSynth \
+"curl \"http://localhost:59125/process?INPUT_TEXT=`echo \'$DATA\'| xxd -plain | tr -d '\\n' | sed 's/\\\(..\\\)/%\\\1/g'`&INPUT_TYPE=TEXT&OUTPUT_TYPE=AUDIO&AUDIO=WAVE_FILE&LOCALE=$LANGUAGE&VOICE=$VOICE\" > $TMPDIR/mary-generic.wav && $PLAY_COMMAND $TMPDIR/mary-generic.wav"
+
+GenericCmdDependency "curl"
+
+# The following three items control punctuation levels None, Some, and All.
+# Each of these values will be substituted into the $PUNCT variable depending
+# on the value passed to speech dispatcher from applications.
+# Note that if an empty string is specified, then $PUNCT will be blank
+# which is a default situation for espeak.
+
+GenericPunctNone ""
+GenericPunctSome "--punct=\"()[]{};:\""
+GenericPunctAll "--punct"
+
+# GenericStripPunctChars is a list (enclosed in doublequotes) of
+# all the characters that should be replaced by whitespaces in
+# order not to be badly handled by the output module or misinterpreted
+# by shell.
+#GenericStripPunctChars  ""
+
+# If the language you need to pass in $LANG is different
+# from the standard ISO language code, you can specify
+# which string to use instead. If you wish to use
+# other than ISO charset for the specified language,
+# you can add it's name (as accepted by iconv) as a
+# third parameter in doublequotes.
+
+GenericLanguage  "en" "en_GB" "utf-8"
+GenericLanguage  "de" "de" "utf-8"
+
+# AddVoice specifies which $VOICE string should be assigned to
+# each language and symbolic voice name. All the voices you want
+# to use must be specified here. This list will likely not be
+# up-to-date, please check your mary installation and add the voices
+# you want to use.
+
+AddVoice        "en"    "MALE1"         "dfki-spike"
+AddVoice        "en"    "FEMALE1"       "dfki-prudence"
+AddVoice        "en"    "CHILD_FEMALE"  "dfki-poppy"
+AddVoice        "de"    "MALE1"         "dfki-pavoque-styles"
+
+# Debug turns debugging on or off
+# See speechd.conf for information where debugging information is stored
+Debug 0
+
+
+# Copyright (C) 2018 Florian Steinhardt <no.known.email@example.com>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/pico-generic.conf b/speech-dispatcher/modules/pico-generic.conf

index df4371f5eae7fc4e11cdc2d616913a32feecb5f7..ba1bff368a7dd08b7ec2600498bf14c1ea0eac8b 100644 (file)
--- a/speech-dispatcher/modules/pico-generic.conf
+++ b/speech-dispatcher/modules/pico-generic.conf
@@ -18,7 +18,9 @@
  # can modify this value, see other parameters).
  # The command can be split into more lines, if necessary, using '\'.
  GenericExecuteSynth \
-"pico2wave -w $TMPDIR/pico.wav -l $VOICE \'$DATA\' && $PLAY_COMMAND $TMPDIR/pico.wav
+"pico2wave -w $TMPDIR/pico.wav -l $VOICE \'$DATA\' && $PLAY_COMMAND $TMPDIR/pico.wav"
+
+GenericCmdDependency "pico2wave"
  
  # The following three items control punctuation levels None, Some, and All.
  # Each of these values will be substituted into the $PUNCT variable depending
@@ -26,7 +28,7 @@ GenericExecuteSynth \
  # Note that if an empty string is specified, then $PUNCT will be blank 
  # which is a default situation for espeak.
   
-GenericPunctNone " "
+GenericPunctNone ""
  GenericPunctSome "--punct=\"()[]{};:\""
  GenericPunctAll "--punct"
  
@@ -75,3 +77,19 @@ AddVoice        "it"    "MALE1"              "it-IT"
  # Debug turns debugging on or off
  # See speechd.conf for information where debugging information is stored
  Debug 0
+
+
+# Copyright (C) 2014-2018 Samuel Thibault <samuel.thibault@ens-lyon.org>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/modules/swift-generic.conf b/speech-dispatcher/modules/swift-generic.conf

index 1623559cac1f41c0346fb825e4453f4d4aaccb96..58726d922f8900278eb2d0860c1867a4fb734f57 100644 (file)
--- a/speech-dispatcher/modules/swift-generic.conf
+++ b/speech-dispatcher/modules/swift-generic.conf
@@ -25,6 +25,8 @@
  GenericExecuteSynth \
   "echo \'$DATA\' >/tmp/swift-speak.txt && /opt/swift/bin/swift -p speech/rate=$RATE,speech/pitch/shift=$PITCH,tts/content-type=text/plain,tts/text-encoding=utf-8,config/default-voice=$VOICE -f /tmp/swift-speak.txt -o /tmp/swift-speak.wav&& $PLAY_COMMAND /tmp/swift-speak.wav" 
  
+GenericCmdDependency "/opt/swift/bin/swift"
+
  # GenericStripPunctChars is a list (enclosed in doublequotes) of
  # all the characters that should be replaced by whitespaces in
  # order not to be badly handled by the output module or misinterpreted
@@ -63,3 +65,19 @@ GenericPitchMultiply 1
  # Debug turns debugging on or off
  # See speechd.conf for information where debugging information is stored
  # Debug 0
+
+
+# Copyright (C) 2008 Brailcom, o.p.s
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/speech-dispatcher/speechd.conf b/speech-dispatcher/speechd.conf

index c166d76537b6aa0d2a79f89f69fc3d2a5d3e8824..8236b226de14f18216cc1517af71cc5e6634357a 100644 (file)
--- a/speech-dispatcher/speechd.conf
+++ b/speech-dispatcher/speechd.conf
@@ -85,6 +85,12 @@ LogDir  "default"
  
  # DefaultPitch  0
  
+# The DefaultPitchRange controls the pitch range of the synthesized voice.  The
+# value must be between -100 (lowest) and +100 (highest), default is
+# 0.
+
+# DefaultPitchRange  0
+
  # The DefaultVolume controls the default volume of the voice.  It is
  # a value between -100 (softly) and +100 (loudly).  Currently, +100
  # maps to the default volume of the synthesizer.
@@ -136,6 +142,13 @@ DefaultVolume 100
  
  # DefaultPunctuationMode "none"
  
+# Whether to use server-side symbols pre-processing by default.
+# This controls whether the server should pre-process the messages to insert
+# the appropriate words or if the output module is responsible for speaking
+# symbols and punctuation.
+
+# DefaultSymbolsPreprocessing 0
+
  # The DefaultCapLetRecognition: if set to "spell", capital letters
  # should be spelled (e.g. "capital b"), if set to "icon",
  # capital letters are indicated by inserting a special sound
@@ -210,20 +223,26 @@ DefaultVolume 100
  #  - configuration is the path to the config file of this module,
  #    either relative (to etc/speech-dispatcher/modules/) or absolute
  
-#AddModule "espeak"       "sd_espeak"   "espeak.conf"
-#AddModule "espeak-ng"    "sd_espeak-ng" "espeak-ng.conf"
-#AddModule "festival"     "sd_festival"  "festival.conf"
-#AddModule "flite"        "sd_flite"     "flite.conf"
-#AddModule "ivona"      "sd_ivona"    "ivona.conf"
-#AddModule "pico"        "sd_pico"     "pico.conf"
-#AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
-#AddModule "espeak-mbrola-generic" "sd_generic" "espeak-mbrola-generic.conf"
-#AddModule "swift-generic" "sd_generic" "swift-generic.conf"
-#AddModule "epos-generic" "sd_generic"   "epos-generic.conf"
-#AddModule "dtk-generic"  "sd_generic"   "dtk-generic.conf"
-#AddModule "pico-generic"  "sd_generic"   "pico-generic.conf"
-#AddModule "ibmtts"       "sd_ibmtts"    "ibmtts.conf"
-#AddModule "cicero"        "sd_cicero"     "cicero.conf"
+#AddModule "espeak"                   "sd_espeak"    "espeak.conf"
+#AddModule "espeak-ng"                "sd_espeak-ng" "espeak-ng.conf"
+#AddModule "festival"                 "sd_festival"  "festival.conf"
+#AddModule "flite"                    "sd_flite"     "flite.conf"
+#AddModule "ivona"                    "sd_ivona"     "ivona.conf"
+#AddModule "pico"                     "sd_pico"      "pico.conf"
+#AddModule "espeak-generic"           "sd_generic"   "espeak-generic.conf"
+#AddModule "espeak-ng-mbrola-generic" "sd_generic"   "espeak-ng-mbrola-generic.conf"
+#AddModule "espeak-mbrola-generic"    "sd_generic"   "espeak-mbrola-generic.conf"
+#AddModule "swift-generic"            "sd_generic"   "swift-generic.conf"
+#AddModule "epos-generic"             "sd_generic"   "epos-generic.conf"
+#AddModule "dtk-generic"              "sd_generic"   "dtk-generic.conf"
+#AddModule "pico-generic"             "sd_generic"   "pico-generic.conf"
+#AddModule "ibmtts"                   "sd_ibmtts"    "ibmtts.conf"
+#AddModule "cicero"                   "sd_cicero"    "cicero.conf"
+#AddModule "kali"                     "sd_kali"      "kali.conf"
+#AddModule "mary-generic"             "sd_generic"   "mary-generic.conf"
+#AddModule "baratinoo"                "sd_baratinoo" "baratinoo.conf"
+#AddModule "rhvoice"                  "sd_rhvoice"   "rhvoice.conf"
+#AddModule "voxin"                    "sd_voxin"     "voxin.conf"
  
  # DO NOT REMOVE the following line unless you have
  # a specific reason -- this is the fallback output module
@@ -269,3 +288,31 @@ Include "clients/*.conf"
  # The DisableAutoSpawn option will disable the autospawn mechanism.
  # Thus the server will not start automatically on requests from the clients
  # DisableAutoSpawn
+
+
+# Copyright (C) 2001-2009 Brailcom, o.p.s
+# Copyright (C) 2009 Rui Batista <ruiandrebatista@gmail.com>
+# Copyright (C) 2010 Andrei Kholodnyi <Andrei.Kholodnyi@gmail.com>
+# Copyright (C) 2010 William Hubbs <w.d.hubbs@gmail.com>
+# Copyright (C) 2010 Trevor Saunders <trev.saunders@gmail.com>
+# Copyright (C) 2012 William Jon McCann <jmccann@redhat.com>
+# Copyright (C) 2014 Rob Whyte <fudge@thefudge.net>
+# Copyright (C) 2014-2016 Luke Yelavich <themuso@ubuntu.com>
+# Copyright (C) 2014 Hussain Jasim <hussainmkj@gmail.com>
+# Copyright (C) 2017 Colomban Wendling <cwendling@hypra.fr>
+# Copyright (C) 2018 Raphaël POITEVIN <rpoitevin@hypra.fr>
+# Copyright (C) 2018 Florian Steinhardt <no.known.email@example.com>
+# Copyright (C) 2018 Samuel Thibault <samuel.thibault@ens-lyon.org>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details (file
+# COPYING in the root directory).
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/ssl/certs/java/cacerts b/ssl/certs/java/cacerts

index a950cd869d4e0f49313d231fefb3e87e09c7c45f..3e6c89c3879390bb3bbf89a0b98d3d6d5c2d4762 100644 (file)

Binary files a/ssl/certs/java/cacerts and b/ssl/certs/java/cacerts differ
diff --git a/ssl/openssl.cnf b/ssl/openssl.cnf

index 7d1a8bb6e7f06b7abf6df53dca4e3170b7fdd2f6..4acca4b0446f536598cc1b127b0975294c928c58 100644 (file)
--- a/ssl/openssl.cnf
+++ b/ssl/openssl.cnf
@@ -10,7 +10,6 @@
  # This definition stops the following lines choking if HOME isn't
  # defined.
  HOME                   = .
-RANDFILE               = $ENV::HOME/.rnd
  
  # Extra OBJECT IDENTIFIER info:
  #oid_file              = $ENV::HOME/.oid
@@ -19,7 +18,7 @@ oid_section           = new_oids
  # To use this configuration file with the "-extfile" option of the
  # "openssl x509" utility, name here the section containing the
  # X.509v3 extensions to use:
-# extensions           = 
+# extensions           =
  # (Alternatively, use a configuration file that has only
  # X.509v3 extensions in its main [= default] section.)
  
@@ -57,7 +56,6 @@ crlnumber     = $dir/crlnumber        # the current crl number
                                         # must be commented out to leave a V1 CRL
  crl            = $dir/crl.pem          # The current CRL
  private_key    = $dir/private/cakey.pem# The private key
-RANDFILE       = $dir/private/.rand    # private random number file
  
  x509_extensions        = usr_cert              # The extensions to add to the cert
  
@@ -117,7 +115,7 @@ x509_extensions     = v3_ca # The extensions to add to the self signed cert
  # input_password = secret
  # output_password = secret
  
-# This sets a mask for permitted string types. There are several options. 
+# This sets a mask for permitted string types. There are several options.
  # default: PrintableString, T61String, BMPString.
  # pkix  : PrintableString, BMPString (PKIX recommendation before 2004)
  # utf8only: only UTF8Strings (PKIX recommendation after 2004).
diff --git a/systemd/system/multi-user.target.wants/dmesg.service b/systemd/system/multi-user.target.wants/dmesg.service

new file mode 120000 (symlink)

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

deleted file mode 120000 (symlink)

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

new file mode 120000 (symlink)

index 0000000..67b75d6
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/etckeeper.timer
@@ -0,0 +1 @@
+/lib/systemd/system/etckeeper.timer
+\ No newline at end of file
diff --git a/systemd/system/multi-user.target.wants/secureboot-db.service b/systemd/system/multi-user.target.wants/secureboot-db.service

new file mode 120000 (symlink)

index 0000000..44e29d7
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/secureboot-db.service
@@ -0,0 +1 @@
+/lib/systemd/system/secureboot-db.service
+\ No newline at end of file
diff --git a/systemd/system/netfilter-persistent.service.d/iptables.conf b/systemd/system/netfilter-persistent.service.d/iptables.conf

new file mode 100644 (file)

index 0000000..2d38823
--- /dev/null
+++ b/systemd/system/netfilter-persistent.service.d/iptables.conf
@@ -0,0 +1,2 @@
+[Unit]
+Conflicts=iptables.service ip6tables.service
diff --git a/systemd/system/timers.target.wants/logrotate.timer b/systemd/system/timers.target.wants/logrotate.timer

new file mode 120000 (symlink)

index 0000000..90f5322
--- /dev/null
+++ b/systemd/system/timers.target.wants/logrotate.timer
@@ -0,0 +1 @@
+/lib/systemd/system/logrotate.timer
+\ No newline at end of file
diff --git a/systemd/user/default.target.wants/powerline-daemon.service b/systemd/user/default.target.wants/powerline-daemon.service

new file mode 120000 (symlink)

index 0000000..6d4bb6a
--- /dev/null
+++ b/systemd/user/default.target.wants/powerline-daemon.service
@@ -0,0 +1 @@
+/usr/lib/systemd/user/powerline-daemon.service
+\ No newline at end of file
diff --git a/ubuntu-advantage/uaclient.conf b/ubuntu-advantage/uaclient.conf

new file mode 100644 (file)

index 0000000..8dc2f1a
--- /dev/null
+++ b/ubuntu-advantage/uaclient.conf
@@ -0,0 +1,5 @@
+# Ubuntu-Advantage client config file.
+contract_url: 'https://contracts.canonical.com'
+data_dir: /var/lib/ubuntu-advantage
+log_level: debug
+log_file: /var/log/ubuntu-advantage.log
diff --git a/udisks2/udisks2.conf b/udisks2/udisks2.conf

index 33a245be718be7508b2287b6005542908c9d28d2..551952a953638d712bf4f7ef2a264ca69fc964ff 100644 (file)
--- a/udisks2/udisks2.conf
+++ b/udisks2/udisks2.conf
@@ -4,3 +4,7 @@
  modules=*
  # Valid options are 'ondemand' or 'onstartup'.
  modules_load_preference=ondemand
+
+[defaults]
+# Valid options are 'luks1' or 'luks2'
+encryption=luks1
diff --git a/update-manager/release-upgrades b/update-manager/release-upgrades

index e511ab72679b29e70d13d11e4e8938e7793287a7..fd6dece1d85a8fb43ecec67c83c657a0fab2f405 100644 (file)
--- a/update-manager/release-upgrades
+++ b/update-manager/release-upgrades
@@ -1,7 +1,7 @@
  # Default behavior for the release upgrader.
  
  [DEFAULT]
-# Default prompting behavior, valid options:
+# Default prompting and upgrade behavior, valid options:
  #
  #  never  - Never check for, or allow upgrading to, a new release.
  #  normal - Check to see if a new release is available.  If more than one new
diff --git a/update-motd.d/80-esm b/update-motd.d/80-esm

deleted file mode 100755 (executable)

index 0857621..0000000
--- a/update-motd.d/80-esm
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-SERIES=$(lsb_release -cs)
-DESCRIPTION=$(lsb_release -ds)
-
-[ "$SERIES" = "precise" ] || exit 0
-
-[ -x /usr/bin/ubuntu-advantage ] || exit 0
-
-if ubuntu-advantage is-esm-enabled; then
-    cat <<EOF
-This ${DESCRIPTION} system is configured to receive extended security updates
-from Canonical:
- * https://www.ubuntu.com/esm
-EOF
-else
-    cat <<EOF
-This ${DESCRIPTION} system is past its End of Life, and is no longer
-receiving security updates.  To protect the integrity of this system, it’s
-critical that you enable Extended Security Maintenance updates:
- * https://www.ubuntu.com/esm
-EOF
-fi
-echo
diff --git a/update-motd.d/80-livepatch b/update-motd.d/80-livepatch

deleted file mode 100755 (executable)

index de59bf1..0000000
--- a/update-motd.d/80-livepatch
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-UA=${UA:-"/usr/bin/ubuntu-advantage"}
-UA_STATUS_CACHE=${UA_STATUS_CACHE:-"/var/cache/ubuntu-advantage-tools/ubuntu-advantage-status.cache"}
-
-[ -x "$UA" ] || exit 0
-
-print_patch_state() {
-    local patch_state="$1"
-
-    case "$patch_state" in
-        unapplied)
-            echo "Patches are available, will be deployed shortly."
-            ;;
-        applied)
-            echo "All available patches applied."
-            ;;
-        applied-with-bug|apply-failed)
-            echo "Live patching failed, please run \`ubuntu-bug linux\` to report a bug."
-            ;;
-        nothing-to-apply)
-            echo "All available patches applied."
-            ;;
-        applying)
-            echo "Live patching currently in progress."
-            ;;
-        *)
-            echo "Unknown patch status. Please see /var/log/syslog for more information."
-            echo "     Status: \"$patch_state\""
-            ;;
-    esac
-}
-
-print_status() {
-    local check_state="$1"
-    local patch_state="$2"
-
-    echo -n "   - "
-    case "$check_state" in
-        needs-check)
-            echo "Regular server check is pending."
-            ;;
-        check-failed)
-            echo "Livepatch server check failed."
-            echo "     Please see /var/log/syslog for more information."
-            ;;
-        checked)
-            print_patch_state "$patch_state"
-            ;;
-        *)
-            echo "Unknown check status. Please see /var/log/syslog for more information."
-            echo "     Status: \"$check_state\""
-            ;;
-    esac
-}
-
-
-service_name="livepatch"
-# if there is no cache file yet (the cron job hasn't run yet), bail
-[ -s "$UA_STATUS_CACHE" ] || exit 0
-ua_status=$(cat "$UA_STATUS_CACHE")
-# if there is no livepatch section at all in the output, silently
-# bail
-has_livepatch=$(echo "${ua_status}" | grep "^${service_name}")
-[ -n "${has_livepatch}" ] || exit 0
-livepatch_status=$(echo "$ua_status"|grep ^${service_name}:|sed -r -n "s,^${service_name}: (.*)$,\\1,p")
-# only look for patchState and checkState inside the specific service
-# block in the status output
-patch_state=$(echo "$ua_status"|sed -r -n "/^${service_name}:/,/^\\S/s,^[[:blank:]]+patchState: (.*)$,\\1,p")
-check_state=$(echo "$ua_status"|sed -r -n "/^${service_name}:/,/^\\S/s,^[[:blank:]]+checkState: (.*)$,\\1,p")
-
-case "$livepatch_status" in
-    "disabled (not available)")
-        # do nothing
-        ;;
-    "enabled")
-        echo
-        echo " * Canonical Livepatch is enabled."
-        print_status "${check_state}" "${patch_state}"
-        ;;
-    "disabled")
-        echo
-        echo " * Canonical Livepatch is available for installation."
-        echo "   - Reduce system reboots and improve kernel security. Activate at:"
-        echo "     https://ubuntu.com/livepatch"
-        ;;
-    *)
-        echo
-        echo " * Canonical Livepatch is in an unknown state."
-        echo "   - Please see /var/log/syslog for more information."
-        echo "     Status: \"$livepatch_status\""
-        ;;
-esac
diff --git a/update-motd.d/90-updates-available b/update-motd.d/90-updates-available

index 404b8893e6e6a789db4326d6db6d45d2f83f5336..9377fdcfd48a8a55849af8cf3d3d6259491c8e9f 100755 (executable)
--- a/update-motd.d/90-updates-available
+++ b/update-motd.d/90-updates-available
@@ -3,3 +3,5 @@
  stamp="/var/lib/update-notifier/updates-available"
  
  [ ! -r "$stamp" ] || cat "$stamp"
+
+find $stamp -newermt 'now-7 days' 2> /dev/null | grep -q -m 1 '.' || /usr/share/update-notifier/notify-updates-outdated
diff --git a/update-motd.d/91-release-upgrade b/update-motd.d/91-release-upgrade

index f00f48940c8ddf562cc1036f36c53ecb0747959d..dc2ae1029a8fc49e06e8084ec111e31287a7ac08 100755 (executable)
--- a/update-motd.d/91-release-upgrade
+++ b/update-motd.d/91-release-upgrade
@@ -4,6 +4,12 @@
  if [ "$(lsb_release -sd | cut -d' ' -f4)" = "(development" ]; then
      exit 0
  fi
+
+# if it is non-root user, skip
+if [ $(id -u) -ne 0 ]; then
+    exit 0
+fi
+
  if [ -x /usr/lib/ubuntu-release-upgrader/release-upgrade-motd ]; then
      exec /usr/lib/ubuntu-release-upgrader/release-upgrade-motd
  fi
diff --git a/updatedb.conf b/updatedb.conf

index 4221f3a009e532247c73ea7afb5f99d81e270d6e..97dd335131609fe57928bcdf9a6bc2020d80edf7 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 /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"
+PRUNEFS="NFS afs autofs binfmt_misc ceph cgroup cgroup2 cifs coda configfs curlftpfs debugfs devfs devpts devtmpfs ecryptfs ftpfs fuse.ceph fuse.cryfs fuse.encfs fuse.glusterfs fuse.gvfsd-fuse fuse.mfs fuse.rozofs fuse.sshfs fusectl fusesmb hugetlbfs iso9660 lustre lustre_lite mfs mqueue ncpfs nfs nfs4 ocfs ocfs2 proc pstore rpc_pipefs securityfs shfs smbfs sysfs tmpfs tracefs udev udf usbfs"
diff --git a/upstream-release/lsb-release b/upstream-release/lsb-release

index 96aa62f9b21cc40a80fe161d4554727533b70da1..c98f479cc714c4cb0b03c9cf5b60f84b0bddfb10 100644 (file)
--- a/upstream-release/lsb-release
+++ b/upstream-release/lsb-release
@@ -1,4 +1,4 @@
  DISTRIB_ID=Ubuntu
-DISTRIB_RELEASE=18.04
-DISTRIB_CODENAME=bionic
-DISTRIB_DESCRIPTION="Ubuntu 18.04 LTS"
+DISTRIB_RELEASE=20.04
+DISTRIB_CODENAME=focal
+DISTRIB_DESCRIPTION="Ubuntu Focal Fossa"
diff --git a/wireshark/init.lua b/wireshark/init.lua

index 91c0d104894c4ae3c11cc0718878cda7b48d8ea2..ffb8ffc9d7c7b60927e9d4060f908255605d0baa 100644 (file)
--- a/wireshark/init.lua
+++ b/wireshark/init.lua
@@ -11,40 +11,20 @@
  --
  -- SPDX-License-Identifier: GPL-2.0-or-later
  
--- Set disable_lua to true to disable Lua support.
-disable_lua = false
+-- Set enable_lua to false to disable Lua support.
+enable_lua = true
  
-if disable_lua then
+if not enable_lua then
      return
  end
  
--- If set and we are running with special privileges this setting
--- tells whether scripts other than this one are to be run.
-run_user_scripts_when_superuser = false
+-- If set and Wireshark was started as (setuid) root, then the user
+-- will not be able to execute custom Lua scripts from the personal
+-- configuration directory, the -Xlua_script command line option or
+-- the Lua Evaluate menu option in the GUI.
+run_user_scripts_when_superuser = true
  
  
--- disable potentialy harmful lua functions when running superuser
-if running_superuser then
-    local hint = "has been disabled due to running Wireshark as superuser. See https://wiki.wireshark.org/CaptureSetup/CapturePrivileges for help in running Wireshark as an unprivileged user."
-    local disabled_lib = {}
-    setmetatable(disabled_lib,{ __index = function() error("this package ".. hint) end } );
-
-    dofile = function() error("dofile " .. hint) end
-    loadfile = function() error("loadfile " .. hint) end
-    loadlib = function() error("loadlib " .. hint) end
-    require = function() error("require " .. hint) end
-    os = disabled_lib
-    io = disabled_lib
-    file = disabled_lib
-end
-
--- to avoid output to stdout which can cause problems lua's print ()
--- has been suppresed so that it yields an error.
--- have print() call info() instead.
-if gui_enabled() then
-    print = info
-end
-
  function typeof(obj)
      local mt = getmetatable(obj)
      return mt and mt.__typeof or obj.__typeof or type(obj)
@@ -74,7 +54,6 @@ end
  --
  -- since 1.11.3
  function package.prepend_path(name)
-    local debug = require "debug"
      -- get the function calling this package.prepend_path function
      local dt = debug.getinfo(2, "f")
      if not dt then
@@ -203,7 +182,7 @@ wtap_encaps = {
         ["SITA"] = 100,
         ["SCCP"] = 101,
         ["BLUETOOTH_HCI"] = 102,
-       ["IPMB"] = 103,
+       ["IPMB_KONTRON"] = 103,
         ["IEEE802_15_4"] = 104,
         ["X2E_XORAYA"] = 105,
         ["FLEXRAY"] = 106,
@@ -212,7 +191,7 @@ wtap_encaps = {
         ["CAN20B"] = 109,
         ["LAYER1_EVENT"] = 110,
         ["X2E_SERIAL"] = 111,
-       ["I2C"] = 112,
+       ["I2C_LINUX"] = 112,
         ["IEEE802_15_4_NONASK_PHY"] = 113,
         ["TNEF"] = 114,
         ["USB_LINUX_MMAPPED"] = 115,
@@ -299,7 +278,16 @@ wtap_encaps = {
         ["MA_WFP_CAPTURE_AUTH_V6"] = 196,
         ["JUNIPER_ST"] = 197,
         ["ETHERNET_MPACKET"] = 198,
-       ["DOCSIS31_XRA31"] = 199
+       ["DOCSIS31_XRA31"] = 199,
+       ["DPAUXMON"] = 200,
+       ["RUBY_MARSHAL"] = 201,
+       ["RFC7468"] = 202,
+       ["SYSTEMD_JOURNAL"] = 203,
+       ["EBHSCR"] = 204,
+       ["VPP"] = 205,
+       ["IEEE802_15_4_TAP"] = 206,
+       ["LOG_3GPP"] = 207,
+       ["USB_2_0"] = 208
  }
  wtap = wtap_encaps -- for bw compatibility
  
@@ -384,6 +372,11 @@ wtap_filetypes = {
         ["NETSCALER_3_5"] = 78,
         ["NETTRACE_3GPP_32_423"] = 79,
         ["MPLOG"] = 80,
+       ["DPA400"] = 81,
+       ["RFC7468"] = 82,
+       ["RUBY_MARSHAL"] = 83,
+       ["SYSTEMD_JOURNAL"] = 84,
+       ["LOG_3GPP"] = 85,
         ["TSPREC_SEC"] = 0,
         ["TSPREC_DSEC"] = 1,
         ["TSPREC_CSEC"] = 2,
@@ -519,29 +512,36 @@ base = {
         ["PT_DCCP"] = 15,  -- DCCP port
         ["PT_SCTP"] = 16,  -- SCTP port
         ["OUI"] = 17,  -- OUI resolution
+       ["RANGE_STRING"] = 256,  -- Use the supplied range string to convert the field to text
         ["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
+       ["NTP_UTC"] = 1003,  -- UTC, with "NULL" when timestamp is all zeros
  }
  
  
  -- Encodings
  ENC_BIG_ENDIAN = 0
  ENC_LITTLE_ENDIAN = 2147483648
+ENC_TIME_SECS_NSECS = 0
  ENC_TIME_TIMESPEC = 0
  ENC_TIME_NTP = 2
  ENC_TIME_TOD = 4
  ENC_TIME_RTPS = 8
-ENC_TIME_NTP_BASE_ZERO = 14
+ENC_TIME_NTP_BASE_ZERO = 8
+ENC_TIME_SECS_USECS = 16
  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_TIME_MIP6 = 36
+ENC_ZIGBEE = 1073741824
+ENC_CHARENCODING_MASK = 1073741822
  ENC_ASCII = 0
+ENC_ISO_646_IRV = 14
  ENC_UTF_8 = 2
  ENC_UTF_16 = 4
  ENC_UCS_2 = 6
@@ -569,7 +569,11 @@ ENC_CP437 = 50
  ENC_ASCII_7BITS = 52
  ENC_T61 = 54
  ENC_EBCDIC_CP037 = 56
-ENC_ZIGBEE = 58
+ENC_WINDOWS_1252 = 58
+ENC_WINDOWS_1251 = 60
+ENC_CP855 = 62
+ENC_CP866 = 64
+ENC_ISO_646_BASIC = 66
  ENC_NA = 0
  ENC_STR_NUM = 16777216
  ENC_STR_HEX = 33554432
@@ -578,6 +582,7 @@ ENC_STR_MASK = 65534
  ENC_NUM_PREF = 2097152
  ENC_VARINT_PROTOBUF = 2
  ENC_VARINT_QUIC = 4
+ENC_VARINT_ZIGZAG = 8
  ENC_SEP_NONE = 65536
  ENC_SEP_COLON = 131072
  ENC_SEP_DASH = 262144
@@ -681,11 +686,17 @@ MENU_STAT_TELEPHONY = 7
  MENU_STAT_TELEPHONY_ANSI = 8
  MENU_STAT_TELEPHONY_GSM = 9
  MENU_STAT_TELEPHONY_LTE = 10
-MENU_STAT_TELEPHONY_MTP = 11
+MENU_STAT_TELEPHONY_MTP3 = 11
  MENU_STAT_TELEPHONY_SCTP = 12
  MENU_TOOLS_UNSORTED = 13
  
  
+-- the possible values for Pinfo's p2p_dir attribute
+P2P_DIR_UNKNOWN = -1
+P2P_DIR_SENT    =  0
+P2P_DIR_RECV    =  1
+
+
  -- other useful constants
  -- DATA_DIR and USER_DIR have a trailing directory separator.
  GUI_ENABLED = gui_enabled()
diff --git a/xattr.conf b/xattr.conf

new file mode 100644 (file)

index 0000000..dcbc12c
--- /dev/null
+++ b/xattr.conf
@@ -0,0 +1,21 @@
+# /etc/xattr.conf
+#
+# Format:
+# <pattern> <action>
+#
+# Actions:
+#   permissions - copy when trying to preserve permissions.
+#   skip - do not copy.
+
+system.nfs4_acl                        permissions
+system.nfs4acl                 permissions
+system.posix_acl_access                permissions
+system.posix_acl_default       permissions
+trusted.SGI_ACL_DEFAULT                skip            # xfs specific
+trusted.SGI_ACL_FILE           skip            # xfs specific
+trusted.SGI_CAP_FILE           skip            # xfs specific
+trusted.SGI_DMI_*              skip            # xfs specific
+trusted.SGI_MAC_FILE           skip            # xfs specific
+xfsroot.*                      skip            # xfs specific; obsolete
+user.Beagle.*                  skip            # ignore Beagle index data
+security.evm                   skip            # may only be written by kernel
diff --git a/xdg/autostart/at-spi-dbus-bus.desktop b/xdg/autostart/at-spi-dbus-bus.desktop

index f4f66a43220857092067c657f162371db29ac2e4..ce97c7b60a8aeff10581fd2e8d7f8bac88e37629 100644 (file)
--- a/xdg/autostart/at-spi-dbus-bus.desktop
+++ b/xdg/autostart/at-spi-dbus-bus.desktop
@@ -1,7 +1,7 @@
  [Desktop Entry]
  Type=Application
  Name=AT-SPI D-Bus Bus
-Exec=/usr/lib/at-spi2-core/at-spi-bus-launcher --launch-immediately
+Exec=/usr/libexec/at-spi-bus-launcher --launch-immediately
  NoDisplay=true
  X-GNOME-AutoRestart=true
  X-GNOME-Autostart-Phase=Initialization
diff --git a/xdg/autostart/geoclue-demo-agent.desktop b/xdg/autostart/geoclue-demo-agent.desktop

new file mode 100644 (file)

index 0000000..8b91926
--- /dev/null
+++ b/xdg/autostart/geoclue-demo-agent.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Geoclue Demo agent
+GenericName=Demo geoclue agent
+Keywords=geolocation;
+Exec=/usr/libexec/geoclue-2.0/demos/agent
+Icon=mark-location-symbolic
+NotShowIn=GNOME;
+NoDisplay=true
+Terminal=false
+Type=Application
diff --git a/xdg/autostart/gnome-keyring-pkcs11.desktop b/xdg/autostart/gnome-keyring-pkcs11.desktop

index dd98079e8bc1041fdbbc2bb4a65b0b0c0cdb3779..045c8a0b16db5fe3e6d2f63d9c57e306f5317d6c 100644 (file)
--- a/xdg/autostart/gnome-keyring-pkcs11.desktop
+++ b/xdg/autostart/gnome-keyring-pkcs11.desktop
@@ -11,5 +11,5 @@ X-GNOME-Autostart-Notify=true
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-keyring
  X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.28.0.2
+X-GNOME-Bugzilla-Version=3.36.0
  X-Ubuntu-Gettext-Domain=gnome-keyring
diff --git a/xdg/autostart/gnome-keyring-secrets.desktop b/xdg/autostart/gnome-keyring-secrets.desktop

index 4e5b93b12afc0e98ef47105567ab66095432e1b4..84e7abdf69623656ee4a4910680165cf6e8c617b 100644 (file)
--- a/xdg/autostart/gnome-keyring-secrets.desktop
+++ b/xdg/autostart/gnome-keyring-secrets.desktop
@@ -11,5 +11,5 @@ X-GNOME-Autostart-Notify=true
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-keyring
  X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.28.0.2
+X-GNOME-Bugzilla-Version=3.36.0
  X-Ubuntu-Gettext-Domain=gnome-keyring
diff --git a/xdg/autostart/gnome-keyring-ssh.desktop b/xdg/autostart/gnome-keyring-ssh.desktop

index 959dfea3fef425f7a8448fd00941579ac2b8134c..4fd4de867a5d173f121dc0f428d709683ee698a7 100644 (file)
--- a/xdg/autostart/gnome-keyring-ssh.desktop
+++ b/xdg/autostart/gnome-keyring-ssh.desktop
@@ -10,5 +10,5 @@ X-GNOME-Autostart-Notify=true
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-keyring
  X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.28.0.2
+X-GNOME-Bugzilla-Version=3.36.0
  X-Ubuntu-Gettext-Domain=gnome-keyring
diff --git a/xdg/autostart/im-launch.desktop b/xdg/autostart/im-launch.desktop

new file mode 100644 (file)

index 0000000..579c976
--- /dev/null
+++ b/xdg/autostart/im-launch.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=im-launch
+Exec=sh -c 'if ! [ -e "/usr/bin/ibus-daemon" ] && [ "x$XDG_SESSION_TYPE" = "xwayland" ] ; then exec env IM_CONFIG_CHECK_ENV=1 im-launch true; fi'
+TryExec=im-launch
+Type=Application
diff --git a/xdg/autostart/mate-power-manager.desktop b/xdg/autostart/mate-power-manager.desktop

index c769297ea8b0e6a2d34055c5bd8226bf5bfa2364..00f35e89535da8cba13763d32dce9c7a92de2928 100644 (file)
--- a/xdg/autostart/mate-power-manager.desktop
+++ b/xdg/autostart/mate-power-manager.desktop
@@ -1,5 +1,4 @@
  [Desktop Entry]
-Name=Power Manager
  Name[am]=የ ሐይል አስተዳዳሪ 
  Name[ar]=مدير الطاقة
  Name[as]=Power Manager
@@ -80,7 +79,7 @@ Name[vi]=Bộ Quản Lý Điện Năng
  Name[zh_CN]=电源管理器
  Name[zh_HK]=電源管理程式
  Name[zh_TW]=電源管理程式
-Comment=Power management daemon
+Name=Power Manager
  Comment[am]=የ ሐይል አስተዳዳሪ አዋቂ
  Comment[ar]=جني إدارة الطاقة
  Comment[as]=বিদ্যুত্‌ পৰিচালনা সম্বন্ধীয় ডেমন
@@ -159,15 +158,31 @@ Comment[vi]=Trình nền quản lý điện năng
  Comment[zh_CN]=电源管理守护程序
  Comment[zh_HK]=電源管理伺服程式
  Comment[zh_TW]=電源管理守護程式
+Comment=Power management daemon
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon[ca]=mate-power-manager
+Icon[cs]=mate-power-manager
+Icon[da]=mate-power-manager
+Icon[es]=mate-power-manager
+Icon[fr]=mate-power-manager
+Icon[gl]=mate-power-manager
+Icon[id]=mate-power-manager
+Icon[it]=mate-power-manager
+Icon[lt]=mate-power-manager
+Icon[ms]=mate-power-manager
+Icon[nb]=mate-power-manager
+Icon[nl]=mate-power-manager
+Icon[pl]=mate-power-manager
+Icon[uk]=mate-power-manager
+Icon[zh_TW]=mate-power-manager
  Icon=mate-power-manager
  Exec=mate-power-manager
  Terminal=false
  Type=Application
-Categories=
  OnlyShowIn=MATE;
  X-MATE-Bugzilla-Bugzilla=MATE
  X-MATE-Bugzilla-Product=mate-power-manager
  X-MATE-Bugzilla-Component=mate-power-manager
-X-MATE-Bugzilla-Version=1.22.2
+X-MATE-Bugzilla-Version=1.24.1
  #X-MATE-AutoRestart=true
  
diff --git a/xdg/autostart/mate-volume-control-applet.desktop b/xdg/autostart/mate-volume-control-applet.desktop

deleted file mode 100644 (file)

index 10a2337..0000000
--- a/xdg/autostart/mate-volume-control-applet.desktop
+++ /dev/null
@@ -1,202 +0,0 @@
-[Desktop Entry]
-Name=Volume Control
-Name[af]=Volumebeheer
-Name[am]=መጠን መቆጣጠሪያ 
-Name[ar]=التحكم في حجم الصوت
-Name[as]=শব্দৰ মাত্ৰা নিয়ন্ত্ৰণকৰ্তা
-Name[ast]=Control de Volume
-Name[az]=Səs İdarəsi
-Name[be]=Кіраванне гукам
-Name[bg]=Сила на звука
-Name[bn]=ভলিউম নিয়ন্ত্রণ
-Name[bn_IN]=শব্দের মাত্রা নিয়ন্ত্রণকারী
-Name[br]=Reoliñ an dregern
-Name[bs]=Kontrola zvuka
-Name[ca]=Control del volum
-Name[ca@valencia]=Control del volum
-Name[cmn]=音量控制
-Name[crh]=Ses Denetimi
-Name[cs]=Ovládání hlasitosti
-Name[cy]=Rheolydd y sain
-Name[da]=Lydstyrkekontrol
-Name[de]=Lautstärkeregler
-Name[dz]=སྐད་ཤུགས་ཚད་འཛིན།
-Name[el]=Έλεγχος έντασης ήχου
-Name[en_AU]=Volume Control
-Name[en_CA]=Volume Control
-Name[en_GB]=Volume Control
-Name[eo]=Laŭteca regilo
-Name[es]=Control de volumen
-Name[es_AR]=Control de volumen
-Name[es_CL]=Control de volumen
-Name[es_CO]=Control de volumen
-Name[es_CR]=Control de volumen
-Name[es_DO]=Control de volumen
-Name[es_EC]=Control de volumen
-Name[es_ES]=Control de volumen
-Name[es_MX]=Control de volumen
-Name[es_NI]=Control de volumen
-Name[es_PA]=Control de volumen
-Name[es_PE]=Control de volumen
-Name[es_PR]=Control de volumen
-Name[es_SV]=Control de volumen
-Name[es_UY]=Control de volumen
-Name[es_VE]=Control de volumen
-Name[et]=Helitugevuse regulaator
-Name[eu]=Bolumen-kontrola
-Name[fa]=کنترل بلندی صدا
-Name[fi]=Äänenvoimakkuuden hallinta
-Name[fr]=Contrôleur de volume
-Name[fr_CA]=Contrôle du Volume
-Name[frp]=Controlo du volumo
-Name[ga]=Rialtán Airde
-Name[gl]=Control do volume
-Name[gu]=અવાજનું પ્રમાણ નિયંત્રક
-Name[he]=בקרת עצמה
-Name[hi]=आवाज निर्धारक नियंत्रक
-Name[hr]=Nadzor glasnoće
-Name[hu]=Hangerőszabályzó
-Name[hy]=Ձայնի բարձրության կարգավորիչ
-Name[id]=Pengatur Volume
-Name[is]=Hljóðstyrkstillir
-Name[it]=Regolazione volume
-Name[ja]=音量調節ツール
-Name[jv]=Kontrol Volume
-Name[ka]=ხმის კონტროლი
-Name[kk]=Дыбыс деңгейін басқару
-Name[kn]=ಧ್ವನಿ ಪ್ರಮಾಣ ನಿಯಂತ್ರಣ
-Name[ko]=볼륨 조정
-Name[ku]=Kontrolkirina Deng
-Name[ky]=Көлөм жөндөгүчү
-Name[lt]=Garsio valdymas
-Name[lv]=Skaļuma kontrole
-Name[mai]=आवाज निर्धारक
-Name[mg]=Fanamafisam-peo
-Name[mk]=Поставување на јачина на звукот
-Name[ml]=ശബ്ദം ക്രമീകാരി
-Name[mn]=Дууны хянагч
-Name[mr]=ध्वनिमान नियंत्रण
-Name[ms]=Kawalan Volum
-Name[nb]=Volumkontroll
-Name[nds]=Luutstärkenoppasser
-Name[ne]=भोल्युम नियन्त्रण
-Name[nl]=Volumeregeling
-Name[nn]=Volumkontroll
-Name[oc]=Contraròtle de volum
-Name[or]=ଧ୍ବନି ପ୍ରବଳତା ନିୟନ୍ତ୍ରକ
-Name[pa]=ਆਵਾਜ਼ ਕੰਟਰੋਲ
-Name[pl]=Regulacja głośności
-Name[ps]=غږ مهار
-Name[pt]=Controlo de Volume
-Name[pt_BR]=Controle de volume
-Name[ro]=Control volum
-Name[ru]=Регулятор громкости
-Name[si]=හඬ පාලකය
-Name[sk]=Ovládanie hlasitosti
-Name[sl]=Nadzor glasnosti
-Name[sq]=Kontrolli i volumit
-Name[sr]=Управљање јачином звука
-Name[sr@latin]=Upravljanje zvukom
-Name[sv]=Volymkontroll
-Name[ta]=ஒலிவளவு கட்டுப்பாடு
-Name[te]=వాల్యూమ్ నియంత్రిక
-Name[th]=ความดังเสียง
-Name[tk]=Hejim Kontroli
-Name[tr]=Ses Kontrolü
-Name[ug]=ئاۋاز تىزگىنى
-Name[uk]=Регулятор гучности
-Name[ur]=آواز کنٹرول
-Name[uz]=Ovoz Nazorati
-Name[vi]=Điều khiển Âm lượng
-Name[wa]=Contrôle do volume
-Name[xh]=Ulawulo lweSandi
-Name[zh_CN]=音量控制
-Name[zh_HK]=音量控制
-Name[zh_TW]=音量控制
-Comment=Show desktop volume control
-Comment[af]=Wys volumebeheer vir die werkskerm
-Comment[am]=የ ዴስክቶፕ መጠን መቆጣጠሪያ ማሳያ 
-Comment[ar]=اعرض التحكم في حجم الصوت
-Comment[as]=ডেস্কটপত শব্দৰ মাত্ৰা নিয়ন্ত্ৰণ ব্যৱস্থা প্ৰদৰ্শন কৰা হ'ব
-Comment[ast]=Amosar el control de volume de l'escritoriu
-Comment[be]=Паказваць кіраўнік гучнасцю на стале
-Comment[bg]=Показване на управлението на звука
-Comment[bn]=ডেস্কটপের মধ্যে ভলিউম নিয়ন্ত্রণ ব্যবস্থা প্রদর্শন করা হবে
-Comment[bn_IN]=ডেস্কটপের মধ্যে শব্দের মাত্রা নিয়ন্ত্রণ ব্যবস্থা প্রদর্শন করা হবে
-Comment[br]=Diskouez reolererezh tregern ar burev
-Comment[ca]=Mostra el control del volum de l'escriptori
-Comment[ca@valencia]=Mostra el control del volum de l'escriptori
-Comment[cmn]=顯示桌面音量控制
-Comment[cs]=Zobrazí ovládání hlasitosti pracovního prostředí
-Comment[cy]=Dangos rheolydd y sain yn y bwrdd gwaith
-Comment[da]=Vis lydstyrkekontrol til skrivebordet
-Comment[de]=Lautstärkeregler anzeigen
-Comment[el]=Εμφάνιση ελέγχου ήχου επιφάνειας εργασίας
-Comment[en_AU]=Show desktop volume control
-Comment[en_GB]=Show desktop volume control
-Comment[es]=Mostrar el control de volumen del escritorio
-Comment[et]=Töölaua helitugevuse regulaatori näitamine
-Comment[eu]=Erakutsi mahaigaineko bolumen-kontrola
-Comment[fi]=Näytä työpöydän äänenvoimakkuuden hallinta
-Comment[fr]=Afficher le contrôleur de volume
-Comment[ga]=‭Taispeáin rialtán airde deisce
-Comment[gl]=Amosar o control de volume do escritorio
-Comment[gu]=ડેસ્કટોપ વોલ્યુમ નિયંત્રણ ને બતાવો
-Comment[he]=הצגת בקרת עצמה בשולחן העבודה
-Comment[hi]=डेस्कटॉप आवाज नियंत्रण दिखाएँ
-Comment[hr]=Prikaži nadzor glasnoće na radnoj površini
-Comment[hu]=Hangerőszabályzó megjelenítése
-Comment[hy]=Ցույց տալ աշխատասեղանի ուժգնության հսկողությունը
-Comment[id]=Tampilkan kendali volume desktop
-Comment[it]=Mostra la regolazione del volume
-Comment[ja]=デスクトップの音量を調節するアプレットです
-Comment[kk]=Жұмыс үстелінің дыбыс деңгейін басқаруды көрсету
-Comment[kn]=ಗಣಕತೆರೆಯ ಧ್ವನಿ ಪ್ರಮಾಣದ ನಿಯಂತ್ರಣವನ್ನು ತೋರಿಸು
-Comment[ko]=데스크톱 볼륨 조정 표시
-Comment[ky]=Иш столунун көлөм жөндөгүчүн көрсөтүү
-Comment[lt]=Rodyti darbalaukio garsio valdiklį
-Comment[lv]=Parādīt darbvirsmas skaņas kontroli
-Comment[ml]=പണിയിട ശബ്ദ ക്രമീകാരി കാണിക്കുക
-Comment[mr]=डेस्कटॉप ध्वनिमान नियंत्रण दाखवा
-Comment[ms]=Tunjuk kawalan volum desktop
-Comment[nb]=Vis volumkontroll for skrivebordet
-Comment[nds]=Schrievdisk
-Comment[nl]=Volumeregeling tonen
-Comment[nn]=Vis volumkontroll til skrivebordet
-Comment[or]=ଡେସ୍କଟପ ଶବ୍ଦ ନିୟନ୍ତ୍ରଣ ଦର୍ଶାନ୍ତୁ
-Comment[pa]=ਡੈਸਕਟਾਪ ਵਾਲੀਅਮ ਕੰਟਰੋਲ ਵੇਖੋ
-Comment[pl]=Wyświetlanie regulacji głośności na pulpicie
-Comment[pt]=Mostrar controlo de volume no ambiente de trabalho
-Comment[pt_BR]=Exibir controle de volume
-Comment[ro]=Afișare control volum desktop
-Comment[ru]=Показать регулятор громкости
-Comment[sk]=Zobrazí ovládanie hlasitosti pracovného prostredia
-Comment[sl]=Pokaži namizni nadzornik zvoka
-Comment[sr]=Прикажите управљање јачином звука
-Comment[sr@latin]=Prikaži kontrolu jačine zvuka
-Comment[sv]=Visa skrivbordets volymkontroll
-Comment[ta]=பணிமேடை ஒலியளவு கட்டுப்பாட்டை காட்டு
-Comment[te]=డెస్కుటాప్ ధ్వని నియంత్రణను చూపుము
-Comment[th]=แสดงหน้าต่างปรับความดังเสียง
-Comment[tr]=Masaüstü ses kontrolünü göster
-Comment[ug]=ئۈستەل`ئۈستى ئاۋاز تىزگىننى كۆرسەت
-Comment[uk]=Показати регулятор гучности
-Comment[ur]=ڈیسک ٹاپ کا آواز کنٹرول دکھائیں
-Comment[vi]=Hiện điều khiển âm lượng trên màn hình nền
-Comment[zh_CN]=显示桌面音量控制
-Comment[zh_HK]=顯示桌面音量控制
-Comment[zh_TW]=顯示桌面音量控制
-Icon=multimedia-volume-control
-Exec=mate-volume-control-applet
-Terminal=false
-Type=Application
-Categories=AudioVideo;Mixer;Settings;HardwareSettings;
-Keywords=MATE;volume;control;mixer;settings;sound;
-NoDisplay=true
-OnlyShowIn=MATE;
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-media
-X-MATE-Bugzilla-Component=mate-volume-control
-# See http://bugzilla.mate.org/show_bug.cgi?id=568320
-#X-MATE-Autostart-Phase=Panel
-X-MATE-Autostart-Notify=true
diff --git a/xdg/autostart/mate-volume-control-status-icon.desktop b/xdg/autostart/mate-volume-control-status-icon.desktop

new file mode 100644 (file)

index 0000000..d32c40e
--- /dev/null
+++ b/xdg/autostart/mate-volume-control-status-icon.desktop
@@ -0,0 +1,228 @@
+[Desktop Entry]
+Name[af]=Volumebeheer
+Name[am]=መጠን መቆጣጠሪያ 
+Name[ar]=التحكم في حجم الصوت
+Name[as]=শব্দৰ মাত্ৰা নিয়ন্ত্ৰণকৰ্তা
+Name[ast]=Control de Volume
+Name[az]=Səs İdarəsi
+Name[be]=Кіраванне гукам
+Name[bg]=Сила на звука
+Name[bn]=ভলিউম নিয়ন্ত্রণ
+Name[bn_IN]=শব্দের মাত্রা নিয়ন্ত্রণকারী
+Name[br]=Reoliñ an dregern
+Name[bs]=Kontrola zvuka
+Name[ca]=Control del volum
+Name[ca@valencia]=Control del volum
+Name[cmn]=音量控制
+Name[crh]=Ses Denetimi
+Name[cs]=Ovládání hlasitosti
+Name[cy]=Rheolydd y sain
+Name[da]=Lydstyrkekontrol
+Name[de]=Lautstärkeregler
+Name[dz]=སྐད་ཤུགས་ཚད་འཛིན།
+Name[el]=Έλεγχος έντασης ήχου
+Name[en_AU]=Volume Control
+Name[en_CA]=Volume Control
+Name[en_GB]=Volume Control
+Name[eo]=Laŭteca regilo
+Name[es]=Control de volumen
+Name[es_AR]=Control de volumen
+Name[es_CL]=Control de volumen
+Name[es_CO]=Control de volumen
+Name[es_CR]=Control de volumen
+Name[es_DO]=Control de volumen
+Name[es_EC]=Control de volumen
+Name[es_ES]=Control de volumen
+Name[es_MX]=Control de volumen
+Name[es_NI]=Control de volumen
+Name[es_PA]=Control de volumen
+Name[es_PE]=Control de volumen
+Name[es_PR]=Control de volumen
+Name[es_SV]=Control de volumen
+Name[es_UY]=Control de volumen
+Name[es_VE]=Control de volumen
+Name[et]=Helitugevuse regulaator
+Name[eu]=Bolumen-kontrola
+Name[fa]=کنترل بلندی صدا
+Name[fi]=Äänenvoimakkuuden hallinta
+Name[fr]=Contrôleur de volume
+Name[fr_CA]=Contrôle du Volume
+Name[frp]=Controlo du volumo
+Name[ga]=Rialtán Airde
+Name[gl]=Control do volume
+Name[gu]=અવાજનું પ્રમાણ નિયંત્રક
+Name[he]=בקרת עצמה
+Name[hi]=आवाज निर्धारक नियंत्रक
+Name[hr]=Nadzor glasnoće
+Name[hu]=Hangerőszabályzó
+Name[hy]=Ձայնի բարձրության կարգավորիչ
+Name[id]=Pengatur Volume
+Name[ie]=Regulator del volúmine
+Name[is]=Hljóðstyrkstillir
+Name[it]=Regolazione volume
+Name[ja]=音量調節ツール
+Name[jv]=Kontrol Volume
+Name[ka]=ხმის კონტროლი
+Name[kk]=Дыбыс деңгейін басқару
+Name[kn]=ಧ್ವನಿ ಪ್ರಮಾಣ ನಿಯಂತ್ರಣ
+Name[ko]=볼륨 조정
+Name[ku]=Kontrolkirina Deng
+Name[ky]=Көлөм жөндөгүчү
+Name[lt]=Garsio valdymas
+Name[lv]=Skaļuma kontrole
+Name[mai]=आवाज निर्धारक
+Name[mg]=Fanamafisam-peo
+Name[mk]=Поставување на јачина на звукот
+Name[ml]=ശബ്ദം ക്രമീകാരി
+Name[mn]=Дууны хянагч
+Name[mr]=ध्वनिमान नियंत्रण
+Name[ms]=Kawalan Volum
+Name[nb]=Volumkontroll
+Name[nds]=Luutstärkenoppasser
+Name[ne]=भोल्युम नियन्त्रण
+Name[nl]=Volumeregeling
+Name[nn]=Volumkontroll
+Name[oc]=Contraròtle de volum
+Name[or]=ଧ୍ବନି ପ୍ରବଳତା ନିୟନ୍ତ୍ରକ
+Name[pa]=ਆਵਾਜ਼ ਕੰਟਰੋਲ
+Name[pl]=Regulacja głośności
+Name[ps]=غږ مهار
+Name[pt]=Controlo de Volume
+Name[pt_BR]=Controle de volume
+Name[ro]=Control volum
+Name[ru]=Регулятор громкости
+Name[si]=හඬ පාලකය
+Name[sk]=Ovládanie hlasitosti
+Name[sl]=Nadzor glasnosti
+Name[sq]=Kontrolli i volumit
+Name[sr]=Управљање јачином звука
+Name[sr@latin]=Upravljanje zvukom
+Name[sv]=Volymkontroll
+Name[ta]=ஒலிவளவு கட்டுப்பாடு
+Name[te]=వాల్యూమ్ నియంత్రిక
+Name[th]=ความดังเสียง
+Name[tk]=Hejim Kontroli
+Name[tr]=Ses Kontrolü
+Name[ug]=ئاۋاز تىزگىنى
+Name[uk]=Регулятор гучности
+Name[ur]=آواز کنٹرول
+Name[uz]=Ovoz Nazorati
+Name[vi]=Điều khiển Âm lượng
+Name[wa]=Contrôle do volume
+Name[xh]=Ulawulo lweSandi
+Name[zh_CN]=音量控制
+Name[zh_HK]=音量控制
+Name[zh_TW]=音量控制
+Name=Volume Control
+Comment[af]=Wys volumebeheer vir die werkskerm
+Comment[am]=የ ዴስክቶፕ መጠን መቆጣጠሪያ ማሳያ 
+Comment[ar]=اعرض التحكم في حجم الصوت
+Comment[as]=ডেস্কটপত শব্দৰ মাত্ৰা নিয়ন্ত্ৰণ ব্যৱস্থা প্ৰদৰ্শন কৰা হ'ব
+Comment[ast]=Amosar el control de volume de l'escritoriu
+Comment[be]=Паказваць кіраўнік гучнасцю на стале
+Comment[bg]=Показване на управлението на звука
+Comment[bn]=ডেস্কটপের মধ্যে ভলিউম নিয়ন্ত্রণ ব্যবস্থা প্রদর্শন করা হবে
+Comment[bn_IN]=ডেস্কটপের মধ্যে শব্দের মাত্রা নিয়ন্ত্রণ ব্যবস্থা প্রদর্শন করা হবে
+Comment[br]=Diskouez reolererezh tregern ar burev
+Comment[ca]=Mostra el control del volum de l'escriptori
+Comment[ca@valencia]=Mostra el control del volum de l'escriptori
+Comment[cmn]=顯示桌面音量控制
+Comment[cs]=Zobrazí ovládání hlasitosti pracovního prostředí
+Comment[cy]=Dangos rheolydd y sain yn y bwrdd gwaith
+Comment[da]=Vis lydstyrkekontrol til skrivebordet
+Comment[de]=Lautstärkeregler anzeigen
+Comment[el]=Εμφάνιση ελέγχου ήχου επιφάνειας εργασίας
+Comment[en_AU]=Show desktop volume control
+Comment[en_GB]=Show desktop volume control
+Comment[es]=Mostrar el control de volumen del escritorio
+Comment[et]=Töölaua helitugevuse regulaatori näitamine
+Comment[eu]=Erakutsi mahaigaineko bolumen-kontrola
+Comment[fi]=Näytä työpöydän äänenvoimakkuuden hallinta
+Comment[fr]=Afficher le contrôleur de volume
+Comment[ga]=‭Taispeáin rialtán airde deisce
+Comment[gl]=Amosar o control de volume do escritorio
+Comment[gu]=ડેસ્કટોપ વોલ્યુમ નિયંત્રણ ને બતાવો
+Comment[he]=הצגת בקרת עצמה בשולחן העבודה
+Comment[hi]=डेस्कटॉप आवाज नियंत्रण दिखाएँ
+Comment[hr]=Prikaži nadzor glasnoće na radnoj površini
+Comment[hu]=Hangerőszabályzó megjelenítése
+Comment[hy]=Ցույց տալ աշխատասեղանի ուժգնության հսկողությունը
+Comment[id]=Tampilkan kendali volume desktop
+Comment[ie]=Monstrar li regulator del volúmine
+Comment[it]=Mostra la regolazione del volume
+Comment[ja]=デスクトップの音量を調節するアプレットです
+Comment[kk]=Жұмыс үстелінің дыбыс деңгейін басқаруды көрсету
+Comment[kn]=ಗಣಕತೆರೆಯ ಧ್ವನಿ ಪ್ರಮಾಣದ ನಿಯಂತ್ರಣವನ್ನು ತೋರಿಸು
+Comment[ko]=데스크톱 볼륨 조정 표시
+Comment[ky]=Иш столунун көлөм жөндөгүчүн көрсөтүү
+Comment[lt]=Rodyti darbalaukio garsio valdiklį
+Comment[lv]=Parādīt darbvirsmas skaņas kontroli
+Comment[ml]=പണിയിട ശബ്ദ ക്രമീകാരി കാണിക്കുക
+Comment[mr]=डेस्कटॉप ध्वनिमान नियंत्रण दाखवा
+Comment[ms]=Tunjuk kawalan volum desktop
+Comment[nb]=Vis volumkontroll for skrivebordet
+Comment[nds]=Schrievdisk
+Comment[nl]=Volumeregeling tonen
+Comment[nn]=Vis volumkontroll til skrivebordet
+Comment[or]=ଡେସ୍କଟପ ଶବ୍ଦ ନିୟନ୍ତ୍ରଣ ଦର୍ଶାନ୍ତୁ
+Comment[pa]=ਡੈਸਕਟਾਪ ਵਾਲੀਅਮ ਕੰਟਰੋਲ ਵੇਖੋ
+Comment[pl]=Wyświetlanie regulacji głośności na pulpicie
+Comment[pt]=Mostrar controlo de volume no ambiente de trabalho
+Comment[pt_BR]=Exibir controle de volume
+Comment[ro]=Afișare control volum desktop
+Comment[ru]=Показать регулятор громкости
+Comment[sk]=Zobrazí ovládanie hlasitosti pracovného prostredia
+Comment[sl]=Pokaži namizni nadzornik zvoka
+Comment[sr]=Прикажите управљање јачином звука
+Comment[sr@latin]=Prikaži kontrolu jačine zvuka
+Comment[sv]=Visa skrivbordets volymkontroll
+Comment[ta]=பணிமேடை ஒலியளவு கட்டுப்பாட்டை காட்டு
+Comment[te]=డెస్కుటాప్ ధ్వని నియంత్రణను చూపుము
+Comment[th]=แสดงหน้าต่างปรับความดังเสียง
+Comment[tr]=Masaüstü ses kontrolünü göster
+Comment[ug]=ئۈستەل`ئۈستى ئاۋاز تىزگىننى كۆرسەت
+Comment[uk]=Показати регулятор гучности
+Comment[ur]=ڈیسک ٹاپ کا آواز کنٹرول دکھائیں
+Comment[vi]=Hiện điều khiển âm lượng trên màn hình nền
+Comment[zh_CN]=显示桌面音量控制
+Comment[zh_HK]=顯示桌面音量控制
+Comment[zh_TW]=顯示桌面音量控制
+Comment=Show desktop volume control
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon[ca]=multimedia-volume-control
+Icon[cs]=multimedia-volume-control
+Icon[da]=multimedia-volume-control
+Icon[es]=multimedia-volume-control
+Icon[gl]=multimedia-volume-control
+Icon[it]=multimedia-volume-control
+Icon[ms]=multimedia-volume-control
+Icon[nb]=multimedia-volume-control
+Icon[nl]=multimedia-volume-control
+Icon[uk]=multimedia-volume-control
+Icon[zh_TW]=multimedia-volume-control
+Icon=multimedia-volume-control
+Exec=mate-volume-control-status-icon
+Terminal=false
+Type=Application
+Categories=AudioVideo;Mixer;Settings;HardwareSettings;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+Keywords[ca]=MATE;volum;control;mesclador;ajusts;so;
+Keywords[cs]=MATE;hlasitost;ovládání;mixer;nastavení;zvuk;
+Keywords[da]=MATE;volume;control;mixer;settings;sound;lydstyrke;kontrol;mikser;lyd;indstillinger;
+Keywords[es]=MATE;volumen;control;mezclador;ajustes;sonido;
+Keywords[gl]=MATE;volume;control;mesturador;axustes;son;
+Keywords[it]=MATE;volume;controllo;audio;mixer;impostazioni;suono;
+Keywords[ms]=MATE;volum;kawalan;pengadun;tetapan;bunyi;
+Keywords[nb]=MATE;volumkontroll;volum;mikser;oppsett;lyd;
+Keywords[nl]=MATE;volume;beheer;mengpaneel;instellingen;geluid;
+Keywords[uk]=MATE;гучність;контроль;змішувач;налаштування;звук;
+Keywords[zh_TW]=MATE;volume;control;mixer;settings;sound;
+Keywords=MATE;volume;control;mixer;settings;sound;
+NoDisplay=true
+OnlyShowIn=MATE;
+X-MATE-Bugzilla-Bugzilla=MATE
+X-MATE-Bugzilla-Product=mate-media
+X-MATE-Bugzilla-Component=mate-volume-control
+# See http://bugzilla.mate.org/show_bug.cgi?id=568320
+#X-MATE-Autostart-Phase=Panel
+X-MATE-Autostart-Notify=true
diff --git a/xdg/autostart/orca-autostart.desktop b/xdg/autostart/orca-autostart.desktop

index 86b252695ff6ad644ab9031c69d41b3631df9f7b..b70bc0610bb5c0bf0df9dd77a211a616fbbee37b 100644 (file)
--- a/xdg/autostart/orca-autostart.desktop
+++ b/xdg/autostart/orca-autostart.desktop
@@ -7,4 +7,4 @@ AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-reader-e
  X-GNOME-AutoRestart=true
  #X-GNOME-Autostart-Phase=Initialization
  OnlyShowIn=GNOME;MATE;Unity;Cinnamon;
-X-Ubuntu-Gettext-Domain=orca
+X-Ubuntu-Gettext-Domain=AC_PACKAGE_TARNAME
diff --git a/xdg/autostart/org.gnome.SettingsDaemon.DiskUtilityNotify.desktop b/xdg/autostart/org.gnome.SettingsDaemon.DiskUtilityNotify.desktop

index 4e13e7f7f5847c252a41f5507c891881ad976827..9c85be722471c1150b5c9ce84d464dfab630ba9b 100644 (file)
--- a/xdg/autostart/org.gnome.SettingsDaemon.DiskUtilityNotify.desktop
+++ b/xdg/autostart/org.gnome.SettingsDaemon.DiskUtilityNotify.desktop
@@ -1,7 +1,7 @@
  [Desktop Entry]
  Type=Application
  Name=gnome-disk-utility notification plugin for GNOME Settings Daemon
-Exec=/usr/lib/gnome-disk-utility/gsd-disk-utility-notify
+Exec=/usr/libexec/gsd-disk-utility-notify
  OnlyShowIn=GNOME;
  NoDisplay=true
  X-GNOME-AutoRestart=true
diff --git a/xdg/autostart/polkit-mate-authentication-agent-1.desktop b/xdg/autostart/polkit-mate-authentication-agent-1.desktop

index 6f60fd4672b56428563b69372b3d4db0ee98328d..470c8c5cff04dde510a3ce0c6d07fc21fff5dda0 100644 (file)
--- a/xdg/autostart/polkit-mate-authentication-agent-1.desktop
+++ b/xdg/autostart/polkit-mate-authentication-agent-1.desktop
@@ -1,5 +1,4 @@
  [Desktop Entry]
-Name=PolicyKit Authentication Agent
  Name[am]=የ አሰራር ጥቅል ማረጋገጫ ወኪል
  Name[ar]=مدير الاستيثاق PolicyKit
  Name[be]=PolicyKit, агент аўтэнтыфікацыі
@@ -29,6 +28,7 @@ Name[hr]=Programski izvršitelj pravila ovjere
  Name[hu]=PolicyKit hitelesítési ügynök
  Name[hy]=PolicyKit Նույնականացման գործակալը
  Name[id]=PolicyKit Authentication Agent
+Name[ie]=Agente de autentication PolicyKit
  Name[is]=PolicyKit auðkenningarþjónn
  Name[it]=Agente di autenticazione per PolicyKit
  Name[ja]=PolicyKit 認証エージェント
@@ -52,6 +52,7 @@ Name[ro]=Agent de autentificare PolicyKit
  Name[ru]=Агент аутентификации PolicyKit
  Name[sk]=Agent PolicyKit na overovanie totožnosti
  Name[sl]=Posrednik overjanja PolicyKit
+Name[sq]=Agjenti Vërtetimit Politikës
  Name[sr]=Агент потврђивања идентитета Прибор политике
  Name[sv]=Autentiseringsagent för PolicyKit
  Name[ta]=PolicyKit அங்கீகார முகவர்
@@ -64,7 +65,7 @@ Name[vi]=PolicyKit Authentication Agent
  Name[zh_CN]=PolicyKit 认证代理
  Name[zh_HK]=PolicyKit 驗證代理程式
  Name[zh_TW]=PolicyKit 驗證代理程式
-Comment=PolicyKit Authentication Agent for the MATE Desktop
+Name=PolicyKit Authentication Agent
  Comment[am]=የ አሰራር ጥቅል ማረጋገጫ ወኪል ለ ሜት ዴስክቶፕ
  Comment[ar]=عميل الاستيثاق PolicyKit لسطح مكتب متّة
  Comment[be]=PolicyKit, агент аўтэнтыфікацыі для асяроддзя MATE
@@ -77,7 +78,7 @@ Comment[de]=PolicyKit-Legitimationsagent für die MATE-Arbeitsumgebung
  Comment[el]=Πράκτορας πιστοποίησης PolicyKit για το MATE Desktop
  Comment[en_AU]=PolicyKit Authentication Agent for the MATE Desktop
  Comment[en_GB]=PolicyKit Authentication Agent for the MATE Desktop
-Comment[es]=Agente de autenticación de PolicyKit para escritorio MATE
+Comment[es]=Agente de autenticación de PolicyKit para el escritorio MATE
  Comment[es_AR]=Agente de Autenticación PolicyKit para el escritorio MATE
  Comment[es_CO]=Agente de autenticación PolicyKit para el entorno MATE
  Comment[et]=MATE töölaua autentimisagent PolicyKit
@@ -90,6 +91,7 @@ Comment[hr]=Programski izvršitelj pravila ovjere za radno okruženje MATE
  Comment[hu]=PolicyKit hitelesítési ügynök a MATE Desktophoz
  Comment[hy]=PolicyKit Նույնականացման գործակալը MATE աշխատանքային սեղանի համար
  Comment[id]=Agen Autentikasi PolicyKit untuk MATE Desktop
+Comment[ie]=Agente de autentication PolicyKit por ambientie MATE
  Comment[is]=PolicyKit auðkenningarþjónn fyrir MATE-skjáborðið
  Comment[it]=Agente di autenticazione per PolicyKit di MATE Desktop
  Comment[ja]=PolicyKit 認証エージェント
@@ -108,6 +110,7 @@ Comment[ro]=Agent de autentificare PolicyKit
  Comment[ru]=Агент аутентификации PolicyKit для рабочей среды MATE
  Comment[sk]=PolicyKit Authentication Agent pre MATE Desktop
  Comment[sl]=Posrednik overitve PolicyKit za namizje MATE
+Comment[sq]=Agjenti Vërtetimit Politikës për MATE Desktop
  Comment[sr]=Прибор политике је агент за потврђивање идентитета за Мејтову радну површ
  Comment[sv]=PolicyKit autentiseringsagent för MATE skrivbordsmiljön
  Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit สำหรับพื้นโต๊ะของ MATE
@@ -116,10 +119,10 @@ Comment[uk]=Агент розпізнання PolicyKit для стільниц
  Comment[vi]=PolicyKit Authentication Agent cho môi trường MATE
  Comment[zh_CN]=MATE 桌面的 PolicyKit 认证代理
  Comment[zh_TW]=MATE 桌面環境的 PolicyKit 驗證代理程式
-Exec=/usr/lib/x86_64-linux-gnu/polkit-mate-authentication-agent-1
+Comment=PolicyKit Authentication Agent for the MATE Desktop
+Exec=/usr/lib/x86_64-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1
  Terminal=false
  Type=Application
-Categories=
  NoDisplay=true
  OnlyShowIn=MATE;
  X-MATE-AutoRestart=true
diff --git a/xdg/autostart/print-applet.desktop b/xdg/autostart/print-applet.desktop

index fd3e2c93b5a52b236243b4a24b00048b34e12719..f7a4794ceb3ac880d1e9cf5392b011c8b578785f 100644 (file)
--- a/xdg/autostart/print-applet.desktop
+++ b/xdg/autostart/print-applet.desktop
@@ -9,5 +9,5 @@ NotShowIn=KDE;GNOME;Cinnamon;LXDE;Unity;
  StartupNotify=false
  X-GNOME-Autostart-Delay=30
  X-Ubuntu-Gettext-Domain=system-config-printer
-X-Desktop-File-Install-Version=0.23
+X-Desktop-File-Install-Version=0.24
  Categories=System;Monitor;GTK;
diff --git a/xdg/autostart/xapp-sn-watcher.desktop b/xdg/autostart/xapp-sn-watcher.desktop

new file mode 100644 (file)

index 0000000..119cd71
--- /dev/null
+++ b/xdg/autostart/xapp-sn-watcher.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=xapp-sn-watcher
+Comment=A service that provides the org.kde.StatusNotifierWatcher interface for XApps
+
+Exec=/usr/libexec/xapps/sn-watcher/xapp-sn-watcher
+
+X-GNOME-Autostart-Phase=Panel
diff --git a/xdg/menus/gnome-applications.menu b/xdg/menus/gnome-applications.menu

index 3a70e20244ab4efcd9cb4ebd3f1abc2910528adc..207451b7048e34e4e02a409c0b07c51db26983d1 100644 (file)
--- a/xdg/menus/gnome-applications.menu
+++ b/xdg/menus/gnome-applications.menu
@@ -6,10 +6,6 @@
    <Name>Applications</Name>
    <Directory>X-GNOME-Menu-Applications.directory</Directory>
  
-  <!-- Scan legacy dirs first, as later items take priority -->
-  <LegacyDir>/etc/X11/applnk</LegacyDir>
-  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
-
    <!-- Read standard .directory and .desktop file locations -->
    <DefaultAppDirs/>
    <DefaultDirectoryDirs/>
@@ -37,23 +33,24 @@
        <!-- Exclude everything we put in the X-GNOME-Utilities whitelist.
  
             Please keep the list alphabetically sorted! -->
-      <Filename>deja-dup-preferences.desktop</Filename>
        <Filename>eog.desktop</Filename>
-      <Filename>evince.desktop</Filename>
-      <Filename>file-roller.desktop</Filename>
-      <Filename>gcalctool.desktop</Filename>
-      <Filename>gnome-dictionary.desktop</Filename>
-      <Filename>gnome-disks.desktop</Filename>
-      <Filename>gnome-font-viewer.desktop</Filename>
-      <Filename>gnome-screenshot.desktop</Filename>
-      <Filename>gnome-terminal.desktop</Filename>
-      <Filename>gnome-tweak-tool.desktop</Filename>
        <Filename>gucharmap.desktop</Filename>
-      <Filename>seahorse.desktop</Filename>
+      <Filename>org.gnome.Calculator.desktop</Filename>
+      <Filename>org.gnome.DejaDup.desktop</Filename>
+      <Filename>org.gnome.Dictionary.desktop</Filename>
+      <Filename>org.gnome.DiskUtility.desktop</Filename>
+      <Filename>org.gnome.Evince.desktop</Filename>
+      <Filename>org.gnome.FileRoller.desktop</Filename>
+      <Filename>org.gnome.font-viewer.desktop</Filename>
+      <Filename>org.gnome.Screenshot.desktop</Filename>
+      <Filename>org.gnome.seahorse.Application.desktop</Filename>
+      <Filename>org.gnome.Terminal.desktop</Filename>
+      <Filename>org.gnome.tweaks.desktop</Filename>
+      <Filename>org.gnome.Usage.desktop</Filename>
+      <Filename>simple-scan.desktop</Filename>
        <Filename>vinagre.desktop</Filename>
        <Filename>yelp.desktop</Filename>
  
-      <!-- Exclude Sundry items -->
      </Exclude>
    </Menu> <!-- End Accessories -->
  
@@ -68,11 +65,6 @@
          <Not><Category>Settings</Category></Not>
        </And>
      </Include>
-
-    <Exclude>
-      <!-- Sundry exclusions -->
-      <Filename>orca.desktop</Filename>
-    </Exclude>
    </Menu> <!-- End Accessibility -->
  
    <!-- Development Tools -->
@@ -85,15 +77,6 @@
        </And>
        <Filename>emacs.desktop</Filename>
      </Include>
-
-    <Exclude>
-      <!-- Sundry exclusions -->
-      <Filename>jhbuild.desktop</Filename>
-      <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
-      <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
-      <Filename>log4j-chainsaw.desktop</Filename>
-      <Filename>log4j-logfactor5.desktop</Filename>
-    </Exclude>
    </Menu> <!-- End Development Tools -->
  
    <!-- Education -->
@@ -238,8 +221,8 @@
        <And>
          <Category>Graphics</Category>
          <Not><Filename>eog.desktop</Filename></Not>
-        <Not><Filename>gnome-eog.desktop</Filename></Not>
-        <Not><Filename>evince.desktop</Filename></Not>
+        <Not><Filename>org.gnome.Evince.desktop</Filename></Not>
+        <Not><Filename>simple-scan.desktop</Filename></Not>
        </And>
      </Include>
    </Menu> <!-- End Graphics -->
@@ -258,13 +241,10 @@
      <Exclude>
        <!-- Utilities exclusions -->
        <Filename>vinagre.desktop</Filename>
-
-      <!-- Sundry exclusions -->
-      <Filename>javaws.desktop</Filename>
      </Exclude>
    </Menu>   <!-- End Internet -->
  
-  <!-- Web Applications -->
+  <!-- FIXME: BROKEN: Web Applications -->
    <Menu>
      <Name>Web Applications</Name>
      <Directory>X-GNOME-WebApplications.directory</Directory>
@@ -294,53 +274,12 @@
      <Include>
        <And>
          <Category>Office</Category>
-        <Not><Filename>evince.desktop</Filename></Not>
-        <Not><Filename>gnome-dictionary.desktop</Filename></Not>
+        <Not><Filename>org.gnome.Dictionary.desktop</Filename></Not>
+        <Not><Filename>org.gnome.Evince.desktop</Filename></Not>
        </And>
      </Include>
    </Menu> <!-- End Office -->
  
-  <!-- Sundry -->
-  <Menu>
-    <Name>Sundry</Name>
-    <Directory>X-GNOME-Sundry.directory</Directory>
-    <Include>
-      <Filename>authconfig.desktop</Filename>
-      <Filename>dconf-editor.desktop</Filename>
-      <Filename>fedora-release-notes.desktop</Filename>
-      <Filename>firewall-config.desktop</Filename>
-      <Filename>flash-player-properties.desktop</Filename>
-      <Filename>gconf-editor.desktop</Filename>
-      <Filename>gnome-abrt.desktop</Filename>
-      <Filename>gnome-power-statistics.desktop</Filename>
-      <Filename>ibus-setup-anthy.desktop</Filename>
-      <Filename>ibus-setup.desktop</Filename>
-      <Filename>ibus-setup-hangul.desktop</Filename>
-      <Filename>ibus-setup-libbopomofo.desktop</Filename>
-      <Filename>ibus-setup-libpinyin.desktop</Filename>
-      <Filename>ibus-setup-m17n.desktop</Filename>
-      <Filename>ibus-setup-typing-booster.desktop</Filename>
-      <Filename>im-chooser.desktop</Filename>
-      <Filename>itweb-settings.desktop</Filename>
-      <Filename>jhbuild.desktop</Filename>
-      <Filename>javaws.desktop</Filename>
-      <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
-      <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
-      <Filename>log4j-chainsaw.desktop</Filename>
-      <Filename>log4j-logfactor5.desktop</Filename>
-      <Filename>nm-connection-editor.desktop</Filename>
-      <Filename>orca.desktop</Filename>
-      <Filename>setroubleshoot.desktop</Filename>
-      <Filename>system-config-date.desktop</Filename>
-      <Filename>system-config-firewall.desktop</Filename>
-      <Filename>system-config-keyboard.desktop</Filename>
-      <Filename>system-config-language.desktop</Filename>
-      <Filename>system-config-printer.desktop</Filename>
-      <Filename>system-config-users.desktop</Filename>
-      <Filename>vino-preferences.desktop</Filename>
-    </Include>
-  </Menu>
-
    <!-- System Tools-->
    <Menu>
      <Name>System</Name>
@@ -356,21 +295,14 @@
  
      <Exclude>
        <!-- Utilities exclusions -->
-      <Filename>baobab.desktop</Filename>
+      <Filename>gnome-abrt.desktop</Filename>
        <Filename>gnome-system-log.desktop</Filename>
        <Filename>gnome-system-monitor.desktop</Filename>
-      <Filename>gnome-terminal.desktop</Filename>
-
-      <!-- Sundry exclusions -->
-      <Filename>dconf-editor.desktop</Filename>
-      <Filename>fedora-release-notes.desktop</Filename>
-      <Filename>gconf-editor.desktop</Filename>
-      <Filename>gnome-abrt.desktop</Filename>
-      <Filename>gnome-power-statistics.desktop</Filename>
-      <Filename>dconf-editor.desktop</Filename>
-      <Filename>setroubleshoot.desktop</Filename>
+      <Filename>org.gnome.baobab.desktop</Filename>
+      <Filename>org.gnome.Terminal.desktop</Filename>
+      <Filename>org.gnome.Usage.desktop</Filename>
      </Exclude>
-    
+
      <Menu>
        <Name>Preferences</Name>
        <Directory>Settings.directory</Directory>
@@ -381,20 +313,13 @@
              <Or>
                <Category>System</Category>
                <Category>X-GNOME-Settings-Panel</Category>
-              <Filename>caribou.desktop</Filename>
-              <Filename>dconf-editor.desktop</Filename>
-              <Filename>fedora-im-chooser.desktop</Filename>
+              <Filename>authconfig.desktop</Filename>
+              <Filename>ca.desrt.dconf-editor.desktop</Filename>
                <Filename>fedora-release-notes.desktop</Filename>
                <Filename>firewall-config.desktop</Filename>
                <Filename>flash-player-properties.desktop</Filename>
                <Filename>gconf-editor.desktop</Filename>
                <Filename>gnome-abrt.desktop</Filename>
-              <Filename>fedora-abrt.desktop</Filename>
-              <Filename>gnome-orca.desktop</Filename>
-              <Filename>gnome-power-statistics.desktop</Filename>
-              <Filename>gnome-user-share-properties.desktop</Filename>
-              <Filename>ibus.desktop</Filename>
-              <Filename>ibus-daemon.desktop</Filename>
                <Filename>ibus-setup-anthy.desktop</Filename>
                <Filename>ibus-setup.desktop</Filename>
                <Filename>ibus-setup-hangul.desktop</Filename>
@@ -411,9 +336,8 @@
                <Filename>log4j-chainsaw.desktop</Filename>
                <Filename>log4j-logfactor5.desktop</Filename>
                <Filename>nm-connection-editor.desktop</Filename>
-              <Filename>orca.desktop</Filename>
+              <Filename>org.gnome.PowerStats.desktop</Filename>
                <Filename>setroubleshoot.desktop</Filename>
-              <Filename>authconfig.desktop</Filename>
                <Filename>system-config-date.desktop</Filename>
                <Filename>system-config-firewall.desktop</Filename>
                <Filename>system-config-keyboard.desktop</Filename>
@@ -436,20 +360,13 @@
            <Not>
              <Or>
                <Category>X-GNOME-Settings-Panel</Category>
-              <Filename>caribou.desktop</Filename>
-              <Filename>dconf-editor.desktop</Filename>
-              <Filename>fedora-im-chooser.desktop</Filename>
+              <Filename>authconfig.desktop</Filename>
+              <Filename>ca.desrt.dconf-editor.desktop</Filename>
                <Filename>fedora-release-notes.desktop</Filename>
                <Filename>firewall-config.desktop</Filename>
                <Filename>flash-player-properties.desktop</Filename>
                <Filename>gconf-editor.desktop</Filename>
                <Filename>gnome-abrt.desktop</Filename>
-              <Filename>fedora-abrt.desktop</Filename>
-              <Filename>gnome-orca.desktop</Filename>
-              <Filename>gnome-power-statistics.desktop</Filename>
-              <Filename>gnome-user-share-properties.desktop</Filename>
-              <Filename>ibus.desktop</Filename>
-              <Filename>ibus-daemon.desktop</Filename>
                <Filename>ibus-setup-anthy.desktop</Filename>
                <Filename>ibus-setup.desktop</Filename>
                <Filename>ibus-setup-hangul.desktop</Filename>
@@ -466,9 +383,8 @@
                <Filename>log4j-chainsaw.desktop</Filename>
                <Filename>log4j-logfactor5.desktop</Filename>
                <Filename>nm-connection-editor.desktop</Filename>
-              <Filename>orca.desktop</Filename>
+              <Filename>org.gnome.PowerStats.desktop</Filename>
                <Filename>setroubleshoot.desktop</Filename>
-              <Filename>authconfig.desktop</Filename>
                <Filename>system-config-date.desktop</Filename>
                <Filename>system-config-firewall.desktop</Filename>
                <Filename>system-config-keyboard.desktop</Filename>
@@ -498,22 +414,26 @@
      <Directory>X-GNOME-Utilities.directory</Directory>
      <Include>
        <Category>X-GNOME-Utilities</Category>
-      <Filename>baobab.desktop</Filename>
-      <Filename>deja-dup-preferences.desktop</Filename>
        <Filename>eog.desktop</Filename>
-      <Filename>evince.desktop</Filename>
-      <Filename>file-roller.desktop</Filename>
-      <Filename>gcalctool.desktop</Filename>
-      <Filename>gnome-dictionary.desktop</Filename>
-      <Filename>gnome-disks.desktop</Filename>
-      <Filename>gnome-font-viewer.desktop</Filename>
-      <Filename>gnome-screenshot.desktop</Filename>
+      <Filename>gnome-abrt.desktop</Filename>
        <Filename>gnome-system-log.desktop</Filename>
        <Filename>gnome-system-monitor.desktop</Filename>
-      <Filename>gnome-terminal.desktop</Filename>
-      <Filename>gnome-tweak-tool.desktop</Filename>
        <Filename>gucharmap.desktop</Filename>
-      <Filename>seahorse.desktop</Filename>
+      <Filename>nm-connection-editor.desktop</Filename>
+      <Filename>org.gnome.baobab.desktop</Filename>
+      <Filename>org.gnome.Calculator.desktop</Filename>
+      <Filename>org.gnome.DejaDup.desktop</Filename>
+      <Filename>org.gnome.Dictionary.desktop</Filename>
+      <Filename>org.gnome.DiskUtility.desktop</Filename>
+      <Filename>org.gnome.Evince.desktop</Filename>
+      <Filename>org.gnome.FileRoller.desktop</Filename>
+      <Filename>org.gnome.fonts.desktop</Filename>
+      <Filename>org.gnome.Screenshot.desktop</Filename>
+      <Filename>org.gnome.seahorse.Application.desktop</Filename>
+      <Filename>org.gnome.Terminal.desktop</Filename>
+      <Filename>org.gnome.tweaks.desktop</Filename>
+      <Filename>org.gnome.Usage.desktop</Filename>
+      <Filename>simple-scan.desktop</Filename>
        <Filename>vinagre.desktop</Filename>
        <Filename>yelp.desktop</Filename>
      </Include>
@@ -533,10 +453,6 @@
          <Not><Category>Network</Category></Not>
          <Not><Category>Office</Category></Not>
          <Not><Category>Utility</Category></Not>
-        <!-- Really Fedora ??? -->
-        <Not><Filename>gnome-eog.desktop</Filename></Not>
-        <Not><Filename>gnome-file-roller.desktop</Filename></Not>
-        <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
        </And>
      </Include>
    </Menu> <!-- End Other -->
diff --git a/xml/docbook-xml.xml b/xml/docbook-xml.xml

index be2eaa143de399bc31d628b221827d2193376fa2..bea23bd96ad64e3464855dc0aeeb1b49361c2dad 100644 (file)
--- a/xml/docbook-xml.xml
+++ b/xml/docbook-xml.xml
@@ -2,68 +2,68 @@
  <!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//ENTITIES DocBook Character Entities V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
+<delegatePublic publicIdStartString="-//Normal Walsh//Exchange Table Model 19960430 XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
+<delegatePublic publicIdStartString="-//Norman Walsh//DTD CALS Table Model XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
+<delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBk XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
  <delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBook XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegateSystem systemIdStartString="http://docbook.org/xml/4.1/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBook XML Additional General Entities V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
+<delegatePublic publicIdStartString="-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
  <delegatePublic publicIdStartString="-//Norman Walsh//ELEMENTS DocBook XML Information Pool V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
+<delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBook XML Additional General Entities V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
+<delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
+<delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
  <delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD XML Exchange Table Model 19990315//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
  <delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
  <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.1//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
  <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegateSystem systemIdStartString="http://docbook.org/xml/4.3/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//DTD XML Exchange Table Model 19990315//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
  <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
  <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegateSystem systemIdStartString="http://docbook.org/xml/4.5/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBk XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
  <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
  <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
  <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
-<delegateSystem systemIdStartString="http://docbook.org/xml/4.4/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Normal Walsh//Exchange Table Model 19960430 XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//Norman Walsh//DTD CALS Table Model XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
+<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
  <delegateSystem systemIdStartString="http://docbook.org/xml/4.1.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
+<delegateSystem systemIdStartString="http://docbook.org/xml/4.1/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
  <delegateSystem systemIdStartString="http://docbook.org/xml/4.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
-<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
+<delegateSystem systemIdStartString="http://docbook.org/xml/4.3/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
+<delegateSystem systemIdStartString="http://docbook.org/xml/4.4/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
+<delegateSystem systemIdStartString="http://docbook.org/xml/4.5/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
+<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/>
+<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/>
+<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/>
+<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/>
+<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/>
+<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/>
+<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/>
  </catalog>
diff --git a/xml/sgml-data.xml b/xml/sgml-data.xml

index 1d1f000928fbd6fe643d23fb9a25c1d58b63b43e..52731609f69639eefd40eafd54231f929351d256 100644 (file)
--- a/xml/sgml-data.xml
+++ b/xml/sgml-data.xml
@@ -2,13 +2,13 @@
  <!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="/usr/share/sgml/dtd/svg" catalog="file:///usr/share/xml/svg/catalog.xml"/>
+<delegatePublic publicIdStartString="+//IDN faq.org//DTD Frequently Asked Questions" catalog="file:///usr/share/xml/qaml/catalog.xml"/>
+<delegatePublic publicIdStartString="+//ISBN 82-7640-023//DTD Frequently Asked Questions//EN" catalog="file:///usr/share/xml/qaml/catalog.xml"/>
+<delegatePublic publicIdStartString="-//W3C//DTD SVG" catalog="file:///usr/share/xml/svg/catalog.xml"/>
  <delegatePublic publicIdStartString="ISO 8879:1986//ENTITIES" catalog="file:///usr/share/xml/entities/xml-iso-entities-8879.1986/catalog.xml"/>
  <delegateSystem systemIdStartString="/usr/share/sgml/dtd/qaml-xml.dtd" catalog="file:///usr/share/xml/qaml/catalog.xml"/>
-<delegatePublic publicIdStartString="-//W3C//DTD SVG" catalog="file:///usr/share/xml/svg/catalog.xml"/>
-<delegateSystem systemIdStartString="http://xml.ascc.net/xml/resource/qaml-xml" catalog="file:///usr/share/xml/qaml/catalog.xml"/>
+<delegateSystem systemIdStartString="/usr/share/sgml/dtd/svg" catalog="file:///usr/share/xml/svg/catalog.xml"/>
  <delegateSystem systemIdStartString="http://www.w3.org/Graphics/SVG/1.1/" catalog="file:///usr/share/xml/svg/catalog.xml"/>
  <delegateSystem systemIdStartString="http://www.w3.org/TR/2001/REC-SVG-20010904/" catalog="file:///usr/share/xml/svg/catalog.xml"/>
-<delegatePublic publicIdStartString="+//IDN faq.org//DTD Frequently Asked Questions" catalog="file:///usr/share/xml/qaml/catalog.xml"/>
-<delegatePublic publicIdStartString="+//ISBN 82-7640-023//DTD Frequently Asked Questions//EN" catalog="file:///usr/share/xml/qaml/catalog.xml"/>
+<delegateSystem systemIdStartString="http://xml.ascc.net/xml/resource/qaml-xml" catalog="file:///usr/share/xml/qaml/catalog.xml"/>
  </catalog>
author	Frank Brehm <frank@brehm-online.com>
	Tue, 21 Jul 2020 09:37:13 +0000 (11:37 +0200)
committer	Frank Brehm <frank@brehm-online.com>
	Tue, 21 Jul 2020 09:37:13 +0000 (11:37 +0200)