diff --git a/.etckeeper b/.etckeeper index ec242049..0b1877fa 100755 --- a/.etckeeper +++ b/.etckeeper @@ -127,6 +127,7 @@ maybe chmod 0644 'bash_completion' maybe chmod 0755 'bash_completion.d' maybe chmod 0644 'bash_completion.d/fail2ban' maybe chmod 0644 'bash_completion.d/git-prompt' +maybe chmod 0644 'bash_completion.d/pmount' maybe chgrp 'bind' 'bind' maybe chmod 2755 'bind' maybe chmod 0644 'bind/bind.keys' @@ -805,9 +806,6 @@ maybe chmod 0644 'init/mountnfs-bootclean.sh.conf' maybe chmod 0644 'init/mountnfs.sh.conf' maybe chmod 0644 'init/mtab.sh.conf' maybe chmod 0644 'init/paxctld.conf' -maybe chmod 0644 'init/portmap-wait.conf' -maybe chmod 0644 'init/rpcbind-boot.conf' -maybe chmod 0644 'init/rpcbind.conf' maybe chmod 0644 'init/rpcbind.override' maybe chmod 0755 'initramfs-tools' maybe chmod 0755 'initramfs-tools/conf.d' @@ -1951,7 +1949,6 @@ maybe chmod 0755 'network/if-up.d' maybe chmod 0755 'network/if-up.d/000resolvconf' maybe chmod 0755 'network/if-up.d/avahi-daemon' maybe chmod 0755 'network/if-up.d/bind9' -maybe chmod 0755 'network/if-up.d/openssh-server' maybe chmod 0644 'network/interfaces' maybe chmod 0755 'network/interfaces.d' maybe chmod 0644 'networks' @@ -2024,6 +2021,7 @@ maybe chmod 0644 'perl/XML/SAX/ParserDetails.ini' maybe chmod 0644 'pip.conf' maybe chmod 0755 'plymouth' maybe chmod 0644 'plymouth/plymouthd.conf' +maybe chmod 0644 'pmount.allow' maybe chmod 0755 'ppp' maybe chmod 0755 'ppp/ip-down.d' maybe chmod 0755 'ppp/ip-down.d/000resolvconf' @@ -2035,6 +2033,7 @@ maybe chmod 0755 'ppp/ip-up.d/exim4' maybe chmod 0644 'profile' maybe chmod 0755 'profile.d' maybe chmod 0644 'profile.d/Z97-byobu.sh' +maybe chmod 0644 'profile.d/at-dbus-fix.sh' maybe chmod 0644 'profile.d/bash_completion.sh' maybe chmod 0644 'profile.d/gawk.csh' maybe chmod 0644 'profile.d/gawk.sh' @@ -2075,7 +2074,6 @@ maybe chmod 0755 'resolvconf' maybe chmod 0644 'resolvconf.conf' maybe chmod 0755 'resolvconf/update-libc.d' maybe chmod 0755 'resolvconf/update-libc.d/avahi-daemon' -maybe chmod 0755 'rmt' maybe chmod 0644 'rpc' maybe chmod 0644 'rpi-issue' maybe chmod 0644 'rsyslog.conf' @@ -2155,6 +2153,7 @@ maybe chmod 0644 'subuid' maybe chmod 0600 'subuid-' maybe chmod 0440 'sudoers' maybe chmod 0755 'sudoers.d' +maybe chmod 0440 'sudoers.d/010_at-export' maybe chmod 0440 'sudoers.d/010_pi-nopasswd' maybe chmod 0440 'sudoers.d/README' maybe chmod 0644 'sysctl.conf' @@ -2216,6 +2215,12 @@ maybe chmod 0755 'update-motd.d' maybe chmod 0755 'update-motd.d/10-uname' maybe chmod 0644 'usb_modeswitch.conf' maybe chmod 0755 'usb_modeswitch.d' +maybe chmod 0755 'usbmount' +maybe chmod 0755 'usbmount/mount.d' +maybe chmod 0755 'usbmount/mount.d/00_create_model_symlink' +maybe chmod 0755 'usbmount/umount.d' +maybe chmod 0755 'usbmount/umount.d/00_remove_model_symlink' +maybe chmod 0644 'usbmount/usbmount.conf' maybe chmod 0644 'vdpau_wrapper.cfg' maybe chmod 0644 'verizon.conf' maybe chmod 0755 'vim' diff --git a/alternatives/arptables b/alternatives/arptables new file mode 120000 index 00000000..f8fcc7ba --- /dev/null +++ b/alternatives/arptables @@ -0,0 +1 @@ +/usr/sbin/arptables-nft \ No newline at end of file diff --git a/alternatives/arptables-restore b/alternatives/arptables-restore new file mode 120000 index 00000000..95e87dc8 --- /dev/null +++ b/alternatives/arptables-restore @@ -0,0 +1 @@ +/usr/sbin/arptables-nft-restore \ No newline at end of file diff --git a/alternatives/arptables-save b/alternatives/arptables-save new file mode 120000 index 00000000..9bb15960 --- /dev/null +++ b/alternatives/arptables-save @@ -0,0 +1 @@ +/usr/sbin/arptables-nft-save \ No newline at end of file diff --git a/alternatives/ebtables b/alternatives/ebtables new file mode 120000 index 00000000..8d5f660c --- /dev/null +++ b/alternatives/ebtables @@ -0,0 +1 @@ +/usr/sbin/ebtables-nft \ No newline at end of file diff --git a/alternatives/ebtables-restore b/alternatives/ebtables-restore new file mode 120000 index 00000000..c2e5813b --- /dev/null +++ b/alternatives/ebtables-restore @@ -0,0 +1 @@ +/usr/sbin/ebtables-nft-restore \ No newline at end of file diff --git a/alternatives/ebtables-save b/alternatives/ebtables-save new file mode 120000 index 00000000..600f8c2d --- /dev/null +++ b/alternatives/ebtables-save @@ -0,0 +1 @@ +/usr/sbin/ebtables-nft-save \ No newline at end of file diff --git a/alternatives/ip6tables b/alternatives/ip6tables new file mode 120000 index 00000000..4c913e2d --- /dev/null +++ b/alternatives/ip6tables @@ -0,0 +1 @@ +/usr/sbin/ip6tables-nft \ No newline at end of file diff --git a/alternatives/ip6tables-restore b/alternatives/ip6tables-restore new file mode 120000 index 00000000..46918a9c --- /dev/null +++ b/alternatives/ip6tables-restore @@ -0,0 +1 @@ +/usr/sbin/ip6tables-nft-restore \ No newline at end of file diff --git a/alternatives/ip6tables-save b/alternatives/ip6tables-save new file mode 120000 index 00000000..04525f05 --- /dev/null +++ b/alternatives/ip6tables-save @@ -0,0 +1 @@ +/usr/sbin/ip6tables-nft-save \ No newline at end of file diff --git a/alternatives/iptables b/alternatives/iptables new file mode 120000 index 00000000..c55fd508 --- /dev/null +++ b/alternatives/iptables @@ -0,0 +1 @@ +/usr/sbin/iptables-nft \ No newline at end of file diff --git a/alternatives/iptables-restore b/alternatives/iptables-restore new file mode 120000 index 00000000..9553657e --- /dev/null +++ b/alternatives/iptables-restore @@ -0,0 +1 @@ +/usr/sbin/iptables-nft-restore \ No newline at end of file diff --git a/alternatives/iptables-save b/alternatives/iptables-save new file mode 120000 index 00000000..051d68bd --- /dev/null +++ b/alternatives/iptables-save @@ -0,0 +1 @@ +/usr/sbin/iptables-nft-save \ No newline at end of file diff --git a/apparmor.d/usr.bin.man b/apparmor.d/usr.bin.man index c44ce724..569aec91 100644 --- a/apparmor.d/usr.bin.man +++ b/apparmor.d/usr.bin.man @@ -34,12 +34,14 @@ # nice in the future, but is tricky since it's quite configurable), but to # confine the processes it calls that parse untrusted data. /** mrixwlk, + unix, capability setuid, capability setgid, - signal peer=man_groff, - signal peer=man_filter, + signal peer=@{profile_name}, + signal peer=/usr/bin/man//&man_groff, + signal peer=/usr/bin/man//&man_filter, # Site-specific additions and overrides. See local/README for details. #include @@ -68,6 +70,8 @@ profile man_groff { /usr/share/groff/** r, signal peer=/usr/bin/man, + # @{profile_name} doesn't seem to work here. + signal peer=/usr/bin/man//&man_groff, } profile man_filter { @@ -92,4 +96,6 @@ profile man_filter { /** r, signal peer=/usr/bin/man, + # @{profile_name} doesn't seem to work here. + signal peer=/usr/bin/man//&man_filter, } diff --git a/apt/apt.conf.d/01autoremove b/apt/apt.conf.d/01autoremove index 6c6767bb..f7775b18 100644 --- a/apt/apt.conf.d/01autoremove +++ b/apt/apt.conf.d/01autoremove @@ -4,6 +4,8 @@ APT { "^firmware-linux.*"; "^linux-firmware$"; + "^linux-image-[a-z0-9]*$"; + "^linux-image-[a-z0-9]*-[a-z0-9]*$"; }; VersionedKernelPackages diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index 7b05a01e..7a340670 100644 --- a/apt/apt.conf.d/01autoremove-kernels +++ b/apt/apt.conf.d/01autoremove-kernels @@ -1,36 +1,36 @@ // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal APT::NeverAutoRemove { - "^linux-image-4\.14\.62-v7\+$"; "^linux-image-4\.14\.71-v7\+$"; - "^linux-headers-4\.14\.62-v7\+$"; + "^linux-image-4\.14\.79-v7\+$"; "^linux-headers-4\.14\.71-v7\+$"; - "^linux-image-extra-4\.14\.62-v7\+$"; + "^linux-headers-4\.14\.79-v7\+$"; "^linux-image-extra-4\.14\.71-v7\+$"; - "^linux-modules-4\.14\.62-v7\+$"; + "^linux-image-extra-4\.14\.79-v7\+$"; "^linux-modules-4\.14\.71-v7\+$"; - "^linux-modules-extra-4\.14\.62-v7\+$"; + "^linux-modules-4\.14\.79-v7\+$"; "^linux-modules-extra-4\.14\.71-v7\+$"; - "^linux-signed-image-4\.14\.62-v7\+$"; + "^linux-modules-extra-4\.14\.79-v7\+$"; "^linux-signed-image-4\.14\.71-v7\+$"; - "^kfreebsd-image-4\.14\.62-v7\+$"; + "^linux-signed-image-4\.14\.79-v7\+$"; "^kfreebsd-image-4\.14\.71-v7\+$"; - "^kfreebsd-headers-4\.14\.62-v7\+$"; + "^kfreebsd-image-4\.14\.79-v7\+$"; "^kfreebsd-headers-4\.14\.71-v7\+$"; - "^gnumach-image-4\.14\.62-v7\+$"; + "^kfreebsd-headers-4\.14\.79-v7\+$"; "^gnumach-image-4\.14\.71-v7\+$"; - "^.*-modules-4\.14\.62-v7\+$"; + "^gnumach-image-4\.14\.79-v7\+$"; "^.*-modules-4\.14\.71-v7\+$"; - "^.*-kernel-4\.14\.62-v7\+$"; + "^.*-modules-4\.14\.79-v7\+$"; "^.*-kernel-4\.14\.71-v7\+$"; - "^linux-backports-modules-.*-4\.14\.62-v7\+$"; + "^.*-kernel-4\.14\.79-v7\+$"; "^linux-backports-modules-.*-4\.14\.71-v7\+$"; - "^linux-modules-.*-4\.14\.62-v7\+$"; + "^linux-backports-modules-.*-4\.14\.79-v7\+$"; "^linux-modules-.*-4\.14\.71-v7\+$"; - "^linux-tools-4\.14\.62-v7\+$"; + "^linux-modules-.*-4\.14\.79-v7\+$"; "^linux-tools-4\.14\.71-v7\+$"; - "^linux-cloud-tools-4\.14\.62-v7\+$"; + "^linux-tools-4\.14\.79-v7\+$"; "^linux-cloud-tools-4\.14\.71-v7\+$"; + "^linux-cloud-tools-4\.14\.79-v7\+$"; }; /* Debug information: # dpkg list: @@ -38,13 +38,13 @@ APT::NeverAutoRemove # list of different kernel versions: -# Installing kernel: (4.14.71-v7+) -# Running kernel: ignored (4.14.62-v7+) +# Installing kernel: (4.14.79-v7+) +# Running kernel: ignored (4.14.71-v7+) # Last kernel: # Previous kernel: # Kernel versions list to keep: # Kernel packages (version part) to protect: -4\.14\.62-v7\+ 4\.14\.71-v7\+ +4\.14\.79-v7\+ */ diff --git a/bash_completion.d/pmount b/bash_completion.d/pmount new file mode 100644 index 00000000..12734ded --- /dev/null +++ b/bash_completion.d/pmount @@ -0,0 +1,96 @@ +#-*- mode: shell-script;-*- +# +# Bash Completion snippet for the pmount command +# Copyright (c) Eduard Bloch, 2009-2011 +# +# Supports most (all?) of the possible option sets of version 0.9.18 except of +# too many device/directory arguments, the charset search can also be improved +# +# Inputs: +# $1 -- name of the command whose arguments are being completed +# $2 -- word being completed +# $3 -- word preceding the word being completed +# $COMP_LINE -- current command line +# $COMP_PONT -- cursor position +# $COMP_WORDS -- array containing individual words in the current +# command line +# $COMP_CWORD -- index into ${COMP_WORDS} of the word containing the +# current cursor position +# Output: +# COMPREPLY array variable contains possible completions + +have pmount && +_pmount() { + + local cur prev options devices fslist + + options=' -r --read-only -w --read-write -s --sync -A --noatime -e --exec \ + -t filesystem --type filesystem -c charset --charset charset -u umask \ + --umask umask --dmask dmask --fmask fmask -p file --passphrase file \ + -h --help -d --debug -V --version' + fslist=' ascii cp1250 cp1251 cp1255 cp437 cp737 cp775 cp850 cp852 cp855 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp932 cp936 cp949 cp950 euc-jp iso8859-1 iso8859-13 iso8859-14 iso8859-15 iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 iso8859-7 iso8859-9 koi8-r koi8-ru koi8-u utf8' + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + + case "$prev" in + -@(t|-type)) + COMPREPLY=( $( grep "^[[:space:]]$cur" /proc/filesystems ) ) + return 0 + ;; + + -@(c|-charset)) + COMPREPLY=( $( compgen -W "$fslist" -- $cur ) ) + return 0 + ;; + -@(u|d|-umask|-dmask)) + COMPREPLY=( ${cur}0 ${cur}1 ${cur}2 ${cur}3 ${cur}4 ${cur}5 ${cur}6 ${cur}7 ) + return 0 + ;; + + -@(p|-passphrase)) + _filedir + return 0 + ;; + + esac + + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W "$options" -- $cur ) ) + else + devices="$( command ls $(grep -v '^[[:space:]]*#' /etc/pmount.allow ) $(grep 1 /sys/block/*/removable | sed -e 's,/sys/block/,/dev/,;s,/removable:1,*,') 2>/dev/null | sort -u | sed -e 's,\(^/dev/\)\(.*\),\1\2 \2,' ; grep $mdir /proc/mounts | sed -e 's,.*\($mdir/[^ ]*\).*,\1,' )" + COMPREPLY=( $( compgen -W "$devices" -- $cur ) ) + fi + + return 0 +} + + +have pumount && +_pumount() { + + local cur prev options devices mdir + + mdir="$(readlink -f /media)" + + options=' -l --luks-force -h --help -d --debug --version' + + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + + + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W "$options" -- $cur ) ) + else + devices="$( grep $mdir /proc/mounts | sed -e 's,.*/$mdir/,,;s,\ .*,,;s,\(.*\),\1\n/dev/\1,;s,/dev//dev,/dev,' )" + COMPREPLY=( $( compgen -W "$devices" -- $cur ) ) + fi + + return 0 +} + +[ "$have" ] && complete -F _pmount $filenames pmount +[ "$have" ] && complete -F _pumount $filenames pumount + diff --git a/cron.d/certbot b/cron.d/certbot index 89f77c2e..e38dbb90 100644 --- a/cron.d/certbot +++ b/cron.d/certbot @@ -5,6 +5,12 @@ # Eventually, this will be an opportunity to validate certificates # haven't been revoked, etc. Renewal will only occur if expiration # is within 30 days. +# +# Important Note! This cronjob will NOT be executed if you are +# running systemd as your init system. If you are running systemd, +# the cronjob.timer function takes precedence over this cronjob. For +# more details, see the systemd.timer manpage, or use systemctl show +# certbot.timer. SHELL=/bin/sh PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin diff --git a/drirc b/drirc index edf14396..0cd04bca 100644 --- a/drirc +++ b/drirc @@ -100,6 +100,14 @@ TODO: document the other workarounds.