From: Frank Brehm Date: Tue, 18 Jul 2017 11:57:23 +0000 (+0200) Subject: committing changes in /etc after apt run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d5458ba3777a57aa4e01f8f48772d99a71bddf5c;p=config%2Fns1%2Fetc.git committing changes in /etc after apt run --- diff --git a/.etckeeper b/.etckeeper index 38fc7d2..539c6e7 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1,6 +1,7 @@ # Generated by etckeeper. Do not edit. mkdir -p './X11/xkb' +mkdir -p './apm/event.d' mkdir -p './apparmor.d/force-complain' mkdir -p './apt/preferences.d' mkdir -p './bind/dyn' @@ -24,29 +25,34 @@ mkdir -p './initramfs-tools/scripts/nfs-premount' mkdir -p './initramfs-tools/scripts/nfs-top' mkdir -p './initramfs-tools/scripts/panic' mkdir -p './insserv/overrides' +mkdir -p './kernel/install.d' mkdir -p './logwatch/conf/logfiles' mkdir -p './logwatch/conf/services' mkdir -p './logwatch/scripts/services' -mkdir -p './network/if-post-down.d' +mkdir -p './modprobe.d' mkdir -p './network/if-pre-up.d' mkdir -p './network/interfaces.d' mkdir -p './opt' mkdir -p './perl/CPAN' mkdir -p './phpmyadmin/conf.d' +mkdir -p './postfix/dynamicmaps.cf.d' mkdir -p './postfix/sasl' mkdir -p './postgresql-common/pg_upgradecluster.d' mkdir -p './salt/proxy.d' mkdir -p './security/limits.d' mkdir -p './security/namespace.d' -mkdir -p './systemd/network' -mkdir -p './systemd/ntp-units.d' mkdir -p './systemd/user' mkdir -p './tmpfiles.d' mkdir -p './udev/hwdb.d' maybe chmod 0755 '.' maybe chmod 0700 '.etckeeper' maybe chmod 0600 '.gitignore' +maybe chmod 0755 'NetworkManager' +maybe chmod 0755 'NetworkManager/dispatcher.d' +maybe chmod 0755 'NetworkManager/dispatcher.d/20-chrony' maybe chmod 0755 'X11' +maybe chmod 0755 'X11/Xsession.d' +maybe chmod 0644 'X11/Xsession.d/90gpg-agent' maybe chmod 0755 'X11/xkb' maybe chmod 0755 'acpi' maybe chmod 0755 'acpi/events' @@ -105,6 +111,7 @@ maybe chmod 0644 'apache2/mods-available/cache.load' maybe chmod 0644 'apache2/mods-available/cache_disk.conf' maybe chmod 0644 'apache2/mods-available/cache_disk.load' maybe chmod 0644 'apache2/mods-available/cache_socache.load' +maybe chmod 0644 'apache2/mods-available/cern_meta.load' maybe chmod 0644 'apache2/mods-available/cgi.load' maybe chmod 0644 'apache2/mods-available/cgid.conf' maybe chmod 0644 'apache2/mods-available/cgid.load' @@ -130,7 +137,9 @@ maybe chmod 0644 'apache2/mods-available/filter.load' maybe chmod 0644 'apache2/mods-available/headers.load' maybe chmod 0644 'apache2/mods-available/heartbeat.load' maybe chmod 0644 'apache2/mods-available/heartmonitor.load' +maybe chmod 0644 'apache2/mods-available/http2.load' maybe chmod 0644 'apache2/mods-available/ident.load' +maybe chmod 0644 'apache2/mods-available/imagemap.load' maybe chmod 0644 'apache2/mods-available/include.load' maybe chmod 0644 'apache2/mods-available/info.conf' maybe chmod 0644 'apache2/mods-available/info.load' @@ -158,6 +167,8 @@ maybe chmod 0644 'apache2/mods-available/negotiation.conf' maybe chmod 0644 'apache2/mods-available/negotiation.load' maybe chmod 0644 'apache2/mods-available/php5.conf' maybe chmod 0644 'apache2/mods-available/php5.load' +maybe chmod 0644 'apache2/mods-available/php7.0.conf' +maybe chmod 0644 'apache2/mods-available/php7.0.load' maybe chmod 0644 'apache2/mods-available/proxy.conf' maybe chmod 0644 'apache2/mods-available/proxy.load' maybe chmod 0644 'apache2/mods-available/proxy_ajp.load' @@ -169,9 +180,11 @@ maybe chmod 0644 'apache2/mods-available/proxy_fcgi.load' maybe chmod 0644 'apache2/mods-available/proxy_fdpass.load' maybe chmod 0644 'apache2/mods-available/proxy_ftp.conf' maybe chmod 0644 'apache2/mods-available/proxy_ftp.load' +maybe chmod 0644 'apache2/mods-available/proxy_hcheck.load' maybe chmod 0644 'apache2/mods-available/proxy_html.conf' maybe chmod 0644 'apache2/mods-available/proxy_html.load' maybe chmod 0644 'apache2/mods-available/proxy_http.load' +maybe chmod 0644 'apache2/mods-available/proxy_http2.load' maybe chmod 0644 'apache2/mods-available/proxy_scgi.load' maybe chmod 0644 'apache2/mods-available/proxy_wstunnel.load' maybe chmod 0644 'apache2/mods-available/ratelimit.load' @@ -217,11 +230,12 @@ maybe chmod 0644 'apache2/sites-available/default-ssl.conf' maybe chmod 0755 'apache2/sites-enabled' maybe chmod 0755 'apm' maybe chmod 0755 'apm/event.d' -maybe chmod 0755 'apm/event.d/01chrony' maybe chmod 0755 'apparmor.d' maybe chmod 0755 'apparmor.d/force-complain' maybe chmod 0755 'apparmor.d/local' +maybe chmod 0644 'apparmor.d/local/usr.sbin.haveged' maybe chmod 0644 'apparmor.d/local/usr.sbin.named' +maybe chmod 0644 'apparmor.d/usr.sbin.haveged' maybe chmod 0644 'apparmor.d/usr.sbin.named' maybe chmod 0755 'apt' maybe chmod 0644 'apt/SALTSTACK-GPG-KEY.pub' @@ -229,7 +243,7 @@ maybe chmod 0755 'apt/apt.conf.d' maybe chmod 0644 'apt/apt.conf.d/00recommends' maybe chmod 0644 'apt/apt.conf.d/00trustcdrom' maybe chmod 0644 'apt/apt.conf.d/01autoremove' -maybe chmod 0644 'apt/apt.conf.d/01autoremove-kernels' +maybe chmod 0444 'apt/apt.conf.d/01autoremove-kernels' maybe chmod 0644 'apt/apt.conf.d/01autoremove-postgresql' maybe chmod 0644 'apt/apt.conf.d/05etckeeper' maybe chmod 0644 'apt/apt.conf.d/70debconf' @@ -261,17 +275,11 @@ maybe chmod 0640 'at.deny' maybe chmod 0644 'bash.bashrc' maybe chmod 0644 'bash_completion' maybe chmod 0755 'bash_completion.d' -maybe chmod 0644 'bash_completion.d/apache2' -maybe chmod 0644 'bash_completion.d/debconf' -maybe chmod 0644 'bash_completion.d/etckeeper' maybe chmod 0644 'bash_completion.d/fail2ban' maybe chmod 0644 'bash_completion.d/git-prompt' maybe chmod 0644 'bash_completion.d/grub' -maybe chmod 0644 'bash_completion.d/initramfs-tools' maybe chmod 0644 'bash_completion.d/insserv' -maybe chmod 0644 'bash_completion.d/isoquery' maybe chmod 0644 'bash_completion.d/salt-common' -maybe chmod 0644 'bash_completion.d/whiptail' maybe chgrp 'bind' 'bind' maybe chmod 2755 'bind' maybe chmod 0644 'bind/bind.keys' @@ -322,6 +330,9 @@ maybe chmod 0755 'console' maybe chmod 0755 'console-setup' maybe chmod 0644 'console-setup/cached_Lat15-Fixed16.psf.gz' maybe chmod 0644 'console-setup/cached_UTF-8_del.kmap.gz' +maybe chmod 0755 'console-setup/cached_setup_font.sh' +maybe chmod 0755 'console-setup/cached_setup_keyboard.sh' +maybe chmod 0755 'console-setup/cached_setup_terminal.sh' maybe chmod 0644 'console-setup/compose.ARMSCII-8.inc' maybe chmod 0644 'console-setup/compose.CP1251.inc' maybe chmod 0644 'console-setup/compose.CP1255.inc' @@ -355,13 +366,14 @@ maybe chmod 0644 'cron.d/.placeholder' maybe chmod 0644 'cron.d/apticron' maybe chmod 0644 'cron.d/certbot' maybe chmod 0644 'cron.d/greetings' +maybe chmod 0644 'cron.d/php' maybe chmod 0644 'cron.d/php5' maybe chmod 0644 'cron.d/sync-pkgs' maybe chmod 0755 'cron.daily' maybe chmod 0644 'cron.daily/.placeholder' maybe chmod 0755 'cron.daily/00logwatch' maybe chmod 0755 'cron.daily/apache2' -maybe chmod 0755 'cron.daily/apt' +maybe chmod 0755 'cron.daily/apt-compat' maybe chmod 0755 'cron.daily/aptitude' maybe chmod 0755 'cron.daily/bsdmainutils' maybe chmod 0755 'cron.daily/dpkg' @@ -386,14 +398,13 @@ maybe chmod 0755 'dbconfig-common' maybe chmod 0600 'dbconfig-common/config' maybe chmod 0600 'dbconfig-common/phpmyadmin.conf' maybe chmod 0755 'dbus-1' -maybe chmod 0644 'dbus-1/session.conf' maybe chmod 0755 'dbus-1/session.d' -maybe chmod 0644 'dbus-1/system.conf' maybe chmod 0755 'dbus-1/system.d' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.hostname1.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.locale1.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.login1.conf' -maybe chmod 0644 'dbus-1/system.d/org.freedesktop.machine1.conf' +maybe chmod 0644 'dbus-1/system.d/org.freedesktop.network1.conf' +maybe chmod 0644 'dbus-1/system.d/org.freedesktop.resolve1.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.systemd1.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.timedate1.conf' maybe chmod 0644 'debconf.conf' @@ -401,9 +412,10 @@ maybe chmod 0644 'debian_version' maybe chmod 0755 'default' maybe chmod 0644 'default/acpid' maybe chmod 0644 'default/aiccu' -maybe chmod 0644 'default/apache2' +maybe chmod 0644 'default/apache-htcacheclean' maybe chmod 0644 'default/bind9' maybe chmod 0644 'default/bsdmainutils' +maybe chmod 0644 'default/chrony' maybe chmod 0644 'default/console-setup' maybe chmod 0644 'default/cron' maybe chmod 0644 'default/dbus' @@ -429,12 +441,12 @@ maybe chmod 0644 'default/tmpfs' maybe chmod 0644 'default/useradd' maybe chmod 0644 'deluser.conf' maybe chmod 0755 'dhcp' +maybe chmod 0644 'dhcp/debug' maybe chmod 0755 'dhcp/dhclient-enter-hooks.d' -maybe chmod 0644 'dhcp/dhclient-enter-hooks.d/debug' maybe chmod 0644 'dhcp/dhclient-enter-hooks.d/nodnsupdate' maybe chmod 0755 'dhcp/dhclient-exit-hooks.d' -maybe chmod 0644 'dhcp/dhclient-exit-hooks.d/debug' maybe chmod 0644 'dhcp/dhclient-exit-hooks.d/rfc3442-classless-routes' +maybe chmod 0644 'dhcp/dhclient-exit-hooks.d/timesyncd' maybe chmod 0644 'dhcp/dhclient.conf' maybe chmod 0755 'dictionaries-common' maybe chmod 0644 'discover-modprobe.conf' @@ -462,6 +474,7 @@ maybe chmod 0755 'etckeeper/commit.d/30hg-addremove' maybe chmod 0755 'etckeeper/commit.d/50vcs-commit' maybe chmod 0755 'etckeeper/commit.d/99push' maybe chmod 0644 'etckeeper/commit.d/README' +maybe chmod 0755 'etckeeper/daily' maybe chmod 0644 'etckeeper/etckeeper.conf' maybe chmod 0755 'etckeeper/init.d' maybe chmod 0755 'etckeeper/init.d/10restore-metadata' @@ -556,18 +569,25 @@ maybe chmod 0755 'fail2ban' maybe chmod 0755 'fail2ban/action.d' maybe chmod 0644 'fail2ban/action.d/apf.conf' maybe chmod 0644 'fail2ban/action.d/badips.conf' +maybe chmod 0644 'fail2ban/action.d/badips.py' maybe chmod 0644 'fail2ban/action.d/blocklist_de.conf' maybe chmod 0644 'fail2ban/action.d/bsd-ipfw.conf' +maybe chmod 0644 'fail2ban/action.d/cloudflare.conf' maybe chmod 0644 'fail2ban/action.d/complain.conf' maybe chmod 0644 'fail2ban/action.d/dshield.conf' maybe chmod 0644 'fail2ban/action.d/dummy.conf' +maybe chmod 0644 'fail2ban/action.d/firewallcmd-allports.conf' maybe chmod 0644 'fail2ban/action.d/firewallcmd-ipset.conf' +maybe chmod 0644 'fail2ban/action.d/firewallcmd-multiport.conf' maybe chmod 0644 'fail2ban/action.d/firewallcmd-new.conf' +maybe chmod 0644 'fail2ban/action.d/firewallcmd-rich-logging.conf' +maybe chmod 0644 'fail2ban/action.d/firewallcmd-rich-rules.conf' maybe chmod 0644 'fail2ban/action.d/hostsdeny.conf' maybe chmod 0644 'fail2ban/action.d/ipfilter.conf' maybe chmod 0644 'fail2ban/action.d/ipfw.conf' maybe chmod 0644 'fail2ban/action.d/iptables-allports.conf' maybe chmod 0644 'fail2ban/action.d/iptables-blocktype.conf' +maybe chmod 0644 'fail2ban/action.d/iptables-common.conf' maybe chmod 0644 'fail2ban/action.d/iptables-ipset-proto4.conf' maybe chmod 0644 'fail2ban/action.d/iptables-ipset-proto6-allports.conf' maybe chmod 0644 'fail2ban/action.d/iptables-ipset-proto6.conf' @@ -577,58 +597,95 @@ maybe chmod 0644 'fail2ban/action.d/iptables-new.conf' maybe chmod 0644 'fail2ban/action.d/iptables-xt_recent-echo.conf' maybe chmod 0644 'fail2ban/action.d/iptables.conf' maybe chmod 0644 'fail2ban/action.d/mail-buffered.conf' +maybe chmod 0644 'fail2ban/action.d/mail-whois-common.conf' maybe chmod 0644 'fail2ban/action.d/mail-whois-lines.conf' maybe chmod 0644 'fail2ban/action.d/mail-whois.conf' maybe chmod 0644 'fail2ban/action.d/mail.conf' maybe chmod 0644 'fail2ban/action.d/mynetwatchman.conf' +maybe chmod 0644 'fail2ban/action.d/nftables-allports.conf' +maybe chmod 0644 'fail2ban/action.d/nftables-common.conf' +maybe chmod 0644 'fail2ban/action.d/nftables-multiport.conf' +maybe chmod 0644 'fail2ban/action.d/npf.conf' +maybe chmod 0644 'fail2ban/action.d/nsupdate.conf' maybe chmod 0644 'fail2ban/action.d/osx-afctl.conf' maybe chmod 0644 'fail2ban/action.d/osx-ipfw.conf' maybe chmod 0644 'fail2ban/action.d/pf.conf' maybe chmod 0644 'fail2ban/action.d/route.conf' maybe chmod 0644 'fail2ban/action.d/sendmail-buffered.conf' maybe chmod 0644 'fail2ban/action.d/sendmail-common.conf' +maybe chmod 0644 'fail2ban/action.d/sendmail-geoip-lines.conf' +maybe chmod 0644 'fail2ban/action.d/sendmail-whois-ipjailmatches.conf' +maybe chmod 0644 'fail2ban/action.d/sendmail-whois-ipmatches.conf' maybe chmod 0644 'fail2ban/action.d/sendmail-whois-lines.conf' +maybe chmod 0644 'fail2ban/action.d/sendmail-whois-matches.conf' maybe chmod 0644 'fail2ban/action.d/sendmail-whois.conf' maybe chmod 0644 'fail2ban/action.d/sendmail.conf' +maybe chmod 0644 'fail2ban/action.d/shorewall-ipset-proto6.conf' maybe chmod 0644 'fail2ban/action.d/shorewall.conf' +maybe chmod 0644 'fail2ban/action.d/smtp.py' +maybe chmod 0644 'fail2ban/action.d/symbiosis-blacklist-allports.conf' maybe chmod 0644 'fail2ban/action.d/ufw.conf' +maybe chmod 0644 'fail2ban/action.d/xarf-login-attack.conf' maybe chmod 0644 'fail2ban/fail2ban.conf' maybe chmod 0755 'fail2ban/fail2ban.d' maybe chmod 0755 'fail2ban/filter.d' maybe chmod 0644 'fail2ban/filter.d/3proxy.conf' maybe chmod 0644 'fail2ban/filter.d/apache-auth.conf' maybe chmod 0644 'fail2ban/filter.d/apache-badbots.conf' +maybe chmod 0644 'fail2ban/filter.d/apache-botsearch.conf' maybe chmod 0644 'fail2ban/filter.d/apache-common.conf' +maybe chmod 0644 'fail2ban/filter.d/apache-fakegooglebot.conf' maybe chmod 0644 'fail2ban/filter.d/apache-modsecurity.conf' maybe chmod 0644 'fail2ban/filter.d/apache-nohome.conf' maybe chmod 0644 'fail2ban/filter.d/apache-noscript.conf' maybe chmod 0644 'fail2ban/filter.d/apache-overflows.conf' +maybe chmod 0644 'fail2ban/filter.d/apache-pass.conf' +maybe chmod 0644 'fail2ban/filter.d/apache-shellshock.conf' maybe chmod 0644 'fail2ban/filter.d/assp.conf' maybe chmod 0644 'fail2ban/filter.d/asterisk.conf' +maybe chmod 0644 'fail2ban/filter.d/botsearch-common.conf' maybe chmod 0644 'fail2ban/filter.d/common.conf' -maybe chmod 0644 'fail2ban/filter.d/courierlogin.conf' -maybe chmod 0644 'fail2ban/filter.d/couriersmtp.conf' +maybe chmod 0644 'fail2ban/filter.d/counter-strike.conf' +maybe chmod 0644 'fail2ban/filter.d/courier-auth.conf' +maybe chmod 0644 'fail2ban/filter.d/courier-smtp.conf' maybe chmod 0644 'fail2ban/filter.d/cyrus-imap.conf' +maybe chmod 0644 'fail2ban/filter.d/directadmin.conf' maybe chmod 0644 'fail2ban/filter.d/dovecot.conf' maybe chmod 0644 'fail2ban/filter.d/dropbear.conf' +maybe chmod 0644 'fail2ban/filter.d/drupal-auth.conf' maybe chmod 0644 'fail2ban/filter.d/ejabberd-auth.conf' maybe chmod 0644 'fail2ban/filter.d/exim-common.conf' maybe chmod 0644 'fail2ban/filter.d/exim-spam.conf' maybe chmod 0644 'fail2ban/filter.d/exim.conf' maybe chmod 0644 'fail2ban/filter.d/freeswitch.conf' +maybe chmod 0644 'fail2ban/filter.d/froxlor-auth.conf' maybe chmod 0644 'fail2ban/filter.d/groupoffice.conf' maybe chmod 0644 'fail2ban/filter.d/gssftpd.conf' +maybe chmod 0644 'fail2ban/filter.d/guacamole.conf' +maybe chmod 0644 'fail2ban/filter.d/haproxy-http-auth.conf' maybe chmod 0644 'fail2ban/filter.d/horde.conf' +maybe chmod 0755 'fail2ban/filter.d/ignorecommands' +maybe chmod 0755 'fail2ban/filter.d/ignorecommands/apache-fakegooglebot' +maybe chmod 0644 'fail2ban/filter.d/kerio.conf' maybe chmod 0644 'fail2ban/filter.d/lighttpd-auth.conf' +maybe chmod 0644 'fail2ban/filter.d/mongodb-auth.conf' +maybe chmod 0644 'fail2ban/filter.d/monit.conf' +maybe chmod 0644 'fail2ban/filter.d/murmur.conf' maybe chmod 0644 'fail2ban/filter.d/mysqld-auth.conf' maybe chmod 0644 'fail2ban/filter.d/nagios.conf' maybe chmod 0644 'fail2ban/filter.d/named-refused.conf' +maybe chmod 0644 'fail2ban/filter.d/nginx-botsearch.conf' maybe chmod 0644 'fail2ban/filter.d/nginx-http-auth.conf' +maybe chmod 0644 'fail2ban/filter.d/nginx-limit-req.conf' maybe chmod 0644 'fail2ban/filter.d/nsd.conf' +maybe chmod 0644 'fail2ban/filter.d/openhab.conf' maybe chmod 0644 'fail2ban/filter.d/openwebmail.conf' +maybe chmod 0644 'fail2ban/filter.d/oracleims.conf' maybe chmod 0644 'fail2ban/filter.d/pam-generic.conf' maybe chmod 0644 'fail2ban/filter.d/perdition.conf' maybe chmod 0644 'fail2ban/filter.d/php-url-fopen.conf' +maybe chmod 0644 'fail2ban/filter.d/portsentry.conf' +maybe chmod 0644 'fail2ban/filter.d/postfix-rbl.conf' maybe chmod 0644 'fail2ban/filter.d/postfix-sasl.conf' maybe chmod 0644 'fail2ban/filter.d/postfix.conf' maybe chmod 0644 'fail2ban/filter.d/proftpd.conf' @@ -636,17 +693,22 @@ maybe chmod 0644 'fail2ban/filter.d/pure-ftpd.conf' maybe chmod 0644 'fail2ban/filter.d/qmail.conf' maybe chmod 0644 'fail2ban/filter.d/recidive.conf' maybe chmod 0644 'fail2ban/filter.d/roundcube-auth.conf' +maybe chmod 0644 'fail2ban/filter.d/screensharingd.conf' maybe chmod 0644 'fail2ban/filter.d/selinux-common.conf' maybe chmod 0644 'fail2ban/filter.d/selinux-ssh.conf' maybe chmod 0644 'fail2ban/filter.d/sendmail-auth.conf' maybe chmod 0644 'fail2ban/filter.d/sendmail-reject.conf' maybe chmod 0644 'fail2ban/filter.d/sieve.conf' +maybe chmod 0644 'fail2ban/filter.d/slapd.conf' maybe chmod 0644 'fail2ban/filter.d/sogo-auth.conf' maybe chmod 0644 'fail2ban/filter.d/solid-pop3d.conf' maybe chmod 0644 'fail2ban/filter.d/squid.conf' +maybe chmod 0644 'fail2ban/filter.d/squirrelmail.conf' maybe chmod 0644 'fail2ban/filter.d/sshd-ddos.conf' maybe chmod 0644 'fail2ban/filter.d/sshd.conf' +maybe chmod 0644 'fail2ban/filter.d/stunnel.conf' maybe chmod 0644 'fail2ban/filter.d/suhosin.conf' +maybe chmod 0644 'fail2ban/filter.d/tine20.conf' maybe chmod 0644 'fail2ban/filter.d/uwimap-auth.conf' maybe chmod 0644 'fail2ban/filter.d/vsftpd.conf' maybe chmod 0644 'fail2ban/filter.d/webmin-auth.conf' @@ -655,8 +717,12 @@ maybe chmod 0644 'fail2ban/filter.d/xinetd-fail.conf' maybe chmod 0644 'fail2ban/jail.conf' maybe chmod 0755 'fail2ban/jail.d' maybe chmod 0644 'fail2ban/jail.d/apache-jail.conf' +maybe chmod 0644 'fail2ban/jail.d/defaults-debian.conf' maybe chmod 0644 'fail2ban/jail.d/postfix.conf' maybe chmod 0644 'fail2ban/jail.d/ssh.conf' +maybe chmod 0644 'fail2ban/paths-common.conf' +maybe chmod 0644 'fail2ban/paths-debian.conf' +maybe chmod 0644 'fail2ban/paths-opensuse.conf' maybe chmod 0755 'fonts' maybe chmod 0755 'fonts/conf.avail' maybe chmod 0644 'fonts/conf.avail/20-unhint-small-dejavu-lgc-sans-mono.conf' @@ -718,6 +784,7 @@ maybe chmod 0755 'init.d' maybe chmod 0644 'init.d/README' maybe chmod 0755 'init.d/acpid' maybe chmod 0755 'init.d/aiccu' +maybe chmod 0755 'init.d/apache-htcacheclean' maybe chmod 0755 'init.d/apache2' maybe chmod 0755 'init.d/atd' maybe chmod 0755 'init.d/bind9' @@ -729,7 +796,7 @@ maybe chmod 0755 'init.d/checkfs.sh' maybe chmod 0755 'init.d/checkroot-bootclean.sh' maybe chmod 0755 'init.d/checkroot.sh' maybe chmod 0755 'init.d/chrony' -maybe chmod 0755 'init.d/console-setup' +maybe chmod 0755 'init.d/console-setup.sh' maybe chmod 0755 'init.d/cron' maybe chmod 0755 'init.d/dbus' maybe chmod 0755 'init.d/exim4' @@ -739,11 +806,12 @@ maybe chmod 0755 'init.d/haveged' maybe chmod 0755 'init.d/hostname.sh' maybe chmod 0755 'init.d/hwclock.sh' maybe chmod 0755 'init.d/kbd' -maybe chmod 0755 'init.d/keyboard-setup' -maybe chmod 0755 'init.d/keymap.sh' +maybe chmod 0755 'init.d/keyboard-setup.sh' maybe chmod 0755 'init.d/killprocs' maybe chmod 0755 'init.d/kmod' maybe chmod 0755 'init.d/lvm2' +maybe chmod 0755 'init.d/lvm2-lvmetad' +maybe chmod 0755 'init.d/lvm2-lvmpolld' maybe chmod 0755 'init.d/motd' maybe chmod 0755 'init.d/mountall-bootclean.sh' maybe chmod 0755 'init.d/mountall.sh' @@ -770,7 +838,6 @@ maybe chmod 0644 'init.d/skeleton' maybe chmod 0755 'init.d/ssh' maybe chmod 0755 'init.d/sudo' maybe chmod 0755 'init.d/udev' -maybe chmod 0755 'init.d/udev-finish' maybe chmod 0755 'init.d/ulogd2' maybe chmod 0755 'init.d/umountfs' maybe chmod 0755 'init.d/umountnfs.sh' @@ -785,8 +852,6 @@ maybe chmod 0644 'init/networking.conf' maybe chmod 0644 'init/salt-minion.conf' maybe chmod 0644 'init/ssh.conf' maybe chmod 0644 'init/startpar-bridge.conf' -maybe chmod 0644 'init/udev-fallback-graphics.conf' -maybe chmod 0644 'init/udev-finish.conf' maybe chmod 0644 'init/udev.conf' maybe chmod 0644 'init/udevmonitor.conf' maybe chmod 0644 'init/udevtrigger.conf' @@ -818,13 +883,17 @@ maybe chmod 0755 'insserv.conf.d' maybe chmod 0644 'insserv.conf.d/postfix' maybe chmod 0755 'insserv/overrides' maybe chmod 0755 'iproute2' +maybe chmod 0644 'iproute2/bpf_pinning' maybe chmod 0644 'iproute2/ematch_map' maybe chmod 0644 'iproute2/group' +maybe chmod 0644 'iproute2/nl_protos' maybe chmod 0644 'iproute2/rt_dsfield' maybe chmod 0644 'iproute2/rt_protos' maybe chmod 0644 'iproute2/rt_realms' maybe chmod 0644 'iproute2/rt_scopes' maybe chmod 0644 'iproute2/rt_tables' +maybe chmod 0755 'iproute2/rt_tables.d' +maybe chmod 0644 'iproute2/rt_tables.d/README' maybe chmod 0755 'iptables' maybe chmod 0640 'iptables/rules.v4' maybe chmod 0640 'iptables/rules.v6' @@ -837,6 +906,7 @@ maybe chmod 0644 'kbd/config' maybe chmod 0644 'kbd/remap' maybe chmod 0755 'kernel' maybe chmod 0644 'kernel-img.conf' +maybe chmod 0755 'kernel/install.d' maybe chmod 0755 'kernel/postinst.d' maybe chmod 0755 'kernel/postinst.d/apt-auto-removal' maybe chmod 0755 'kernel/postinst.d/initramfs-tools' @@ -939,10 +1009,9 @@ maybe chmod 0755 'lighttpd/conf-enabled' maybe chmod 0644 'locale.alias' maybe chmod 0644 'locale.gen' maybe chmod 0644 'locale.gen.bak' -maybe chmod 0644 'localtime' maybe chmod 0755 'logcheck' maybe chmod 0755 'logcheck/ignore.d.server' -maybe chmod 0755 'logcheck/ignore.d.server/libsasl2-modules' +maybe chmod 0644 'logcheck/ignore.d.server/libsasl2-modules' maybe chmod 0644 'logcheck/ignore.d.server/rsyslog' maybe chmod 0644 'login.defs' maybe chmod 0644 'logrotate.conf' @@ -952,6 +1021,7 @@ maybe chmod 0644 'logrotate.d/apt' maybe chmod 0644 'logrotate.d/aptitude' maybe chmod 0644 'logrotate.d/bind' maybe chmod 0644 'logrotate.d/chrony' +maybe chmod 0644 'logrotate.d/dbconfig-common' maybe chmod 0644 'logrotate.d/dpkg' maybe chmod 0644 'logrotate.d/exim4-base' maybe chmod 0644 'logrotate.d/exim4-paniclog' @@ -983,15 +1053,23 @@ maybe chmod 0644 'manpath.config' maybe chmod 0644 'mime.types' maybe chmod 0644 'mke2fs.conf' maybe chmod 0755 'modprobe.d' -maybe chmod 0644 'modprobe.d/fbdev-blacklist.conf' maybe chmod 0644 'modules' maybe chmod 0755 'modules-load.d' +maybe chmod 0755 'monit' +maybe chmod 0755 'monit/monitrc.d' +maybe chmod 0644 'monit/monitrc.d/fail2ban' +maybe chmod 0644 'motd' maybe chmod 0644 'motd.tail' maybe chmod 0755 'mysql' maybe chmod 0755 'mysql/conf.d' -maybe chmod 0644 'mysql/conf.d/.keepme' maybe chmod 0644 'mysql/conf.d/mariadb.cnf' -maybe chmod 0644 'mysql/my.cnf' +maybe chmod 0644 'mysql/conf.d/mysql.cnf' +maybe chmod 0644 'mysql/conf.d/mysqldump.cnf' +maybe chmod 0644 'mysql/mariadb.cnf' +maybe chmod 0755 'mysql/mariadb.conf.d' +maybe chmod 0644 'mysql/mariadb.conf.d/50-client.cnf' +maybe chmod 0644 'mysql/mariadb.conf.d/50-mysql-clients.cnf' +maybe chmod 0644 'mysql/my.cnf.fallback' maybe chmod 0644 'nanorc' maybe chmod 0755 'network' maybe chmod 0755 'network/if-down.d' @@ -999,9 +1077,12 @@ maybe chmod 0755 'network/if-down.d/bind9' maybe chmod 0755 'network/if-down.d/postfix' maybe chmod 0755 'network/if-down.d/upstart' maybe chmod 0755 'network/if-post-down.d' +maybe chmod 0755 'network/if-post-down.d/chrony' maybe chmod 0755 'network/if-pre-up.d' maybe chmod 0755 'network/if-up.d' +maybe chmod 0755 'network/if-up.d/aiccu' maybe chmod 0755 'network/if-up.d/bind9' +maybe chmod 0755 'network/if-up.d/chrony' maybe chmod 0755 'network/if-up.d/mountnfs' maybe chmod 0755 'network/if-up.d/openssh-server' maybe chmod 0755 'network/if-up.d/postfix' @@ -1044,6 +1125,45 @@ maybe chmod 0755 'perl/CPAN' maybe chmod 0755 'perl/Net' maybe chmod 0644 'perl/Net/libnet.cfg' maybe chmod 0644 'perl/sitecustomize.pl' +maybe chmod 0755 'php' +maybe chmod 0755 'php/7.0' +maybe chmod 0755 'php/7.0/apache2' +maybe chmod 0755 'php/7.0/apache2/conf.d' +maybe chmod 0644 'php/7.0/apache2/php.ini' +maybe chmod 0755 'php/7.0/cli' +maybe chmod 0755 'php/7.0/cli/conf.d' +maybe chmod 0644 'php/7.0/cli/php.ini' +maybe chmod 0755 'php/7.0/mods-available' +maybe chmod 0644 'php/7.0/mods-available/calendar.ini' +maybe chmod 0644 'php/7.0/mods-available/ctype.ini' +maybe chmod 0644 'php/7.0/mods-available/dom.ini' +maybe chmod 0644 'php/7.0/mods-available/exif.ini' +maybe chmod 0644 'php/7.0/mods-available/fileinfo.ini' +maybe chmod 0644 'php/7.0/mods-available/ftp.ini' +maybe chmod 0644 'php/7.0/mods-available/gettext.ini' +maybe chmod 0644 'php/7.0/mods-available/iconv.ini' +maybe chmod 0644 'php/7.0/mods-available/json.ini' +maybe chmod 0644 'php/7.0/mods-available/mbstring.ini' +maybe chmod 0644 'php/7.0/mods-available/mysqli.ini' +maybe chmod 0644 'php/7.0/mods-available/mysqlnd.ini' +maybe chmod 0644 'php/7.0/mods-available/opcache.ini' +maybe chmod 0644 'php/7.0/mods-available/pdo.ini' +maybe chmod 0644 'php/7.0/mods-available/pdo_mysql.ini' +maybe chmod 0644 'php/7.0/mods-available/phar.ini' +maybe chmod 0644 'php/7.0/mods-available/posix.ini' +maybe chmod 0644 'php/7.0/mods-available/readline.ini' +maybe chmod 0644 'php/7.0/mods-available/shmop.ini' +maybe chmod 0644 'php/7.0/mods-available/simplexml.ini' +maybe chmod 0644 'php/7.0/mods-available/sockets.ini' +maybe chmod 0644 'php/7.0/mods-available/sysvmsg.ini' +maybe chmod 0644 'php/7.0/mods-available/sysvsem.ini' +maybe chmod 0644 'php/7.0/mods-available/sysvshm.ini' +maybe chmod 0644 'php/7.0/mods-available/tokenizer.ini' +maybe chmod 0644 'php/7.0/mods-available/wddx.ini' +maybe chmod 0644 'php/7.0/mods-available/xml.ini' +maybe chmod 0644 'php/7.0/mods-available/xmlreader.ini' +maybe chmod 0644 'php/7.0/mods-available/xmlwriter.ini' +maybe chmod 0644 'php/7.0/mods-available/xsl.ini' maybe chmod 0755 'php5' maybe chmod 0755 'php5/apache2' maybe chmod 0755 'php5/apache2/conf.d' @@ -1081,12 +1201,19 @@ maybe chmod 0755 'pm/sleep.d' maybe chmod 0755 'pm/sleep.d/60aiccu' maybe chmod 0755 'postfix' maybe chmod 0644 'postfix/dynamicmaps.cf' +maybe chmod 0755 'postfix/dynamicmaps.cf.d' maybe chmod 0644 'postfix/main.cf' +maybe chmod 0644 'postfix/main.cf.proto' +maybe chmod 0644 'postfix/makedefs.out' maybe chmod 0644 'postfix/master.cf' +maybe chmod 0644 'postfix/master.cf.proto' maybe chmod 0744 'postfix/mkpostfixcert' maybe chmod 0755 'postfix/post-install' maybe chmod 0644 'postfix/postfix-cert.cnf' maybe chmod 0644 'postfix/postfix-files' +maybe chmod 0755 'postfix/postfix-files.d' +maybe chmod 0644 'postfix/postfix-files.d/pcre.files' +maybe chmod 0644 'postfix/postfix-files.d/sqlite.files' maybe chmod 0755 'postfix/postfix-script' maybe chmod 0600 'postfix/postfix.pem' maybe chmod 0755 'postfix/sasl' @@ -1097,6 +1224,7 @@ maybe chmod 0755 'postgresql-common' maybe chmod 0644 'postgresql-common/createcluster.conf' maybe chmod 0755 'postgresql-common/pg_upgradecluster.d' maybe chmod 0644 'postgresql-common/root.crt' +maybe chmod 0644 'postgresql-common/supported_versions' maybe chmod 0644 'postgresql-common/user_clusters' maybe chown 'postgres' 'postgresql/9.4' maybe chgrp 'postgres' 'postgresql/9.4' @@ -1122,6 +1250,30 @@ maybe chmod 0644 'postgresql/9.4/main/postgresql.conf' maybe chown 'postgres' 'postgresql/9.4/main/start.conf' maybe chgrp 'postgres' 'postgresql/9.4/main/start.conf' maybe chmod 0644 'postgresql/9.4/main/start.conf' +maybe chown 'postgres' 'postgresql/9.6' +maybe chgrp 'postgres' 'postgresql/9.6' +maybe chmod 0755 'postgresql/9.6' +maybe chown 'postgres' 'postgresql/9.6/main' +maybe chgrp 'postgres' 'postgresql/9.6/main' +maybe chmod 0755 'postgresql/9.6/main' +maybe chown 'postgres' 'postgresql/9.6/main/environment' +maybe chgrp 'postgres' 'postgresql/9.6/main/environment' +maybe chmod 0644 'postgresql/9.6/main/environment' +maybe chown 'postgres' 'postgresql/9.6/main/pg_ctl.conf' +maybe chgrp 'postgres' 'postgresql/9.6/main/pg_ctl.conf' +maybe chmod 0644 'postgresql/9.6/main/pg_ctl.conf' +maybe chown 'postgres' 'postgresql/9.6/main/pg_hba.conf' +maybe chgrp 'postgres' 'postgresql/9.6/main/pg_hba.conf' +maybe chmod 0640 'postgresql/9.6/main/pg_hba.conf' +maybe chown 'postgres' 'postgresql/9.6/main/pg_ident.conf' +maybe chgrp 'postgres' 'postgresql/9.6/main/pg_ident.conf' +maybe chmod 0640 'postgresql/9.6/main/pg_ident.conf' +maybe chown 'postgres' 'postgresql/9.6/main/postgresql.conf' +maybe chgrp 'postgres' 'postgresql/9.6/main/postgresql.conf' +maybe chmod 0644 'postgresql/9.6/main/postgresql.conf' +maybe chown 'postgres' 'postgresql/9.6/main/start.conf' +maybe chgrp 'postgres' 'postgresql/9.6/main/start.conf' +maybe chmod 0644 'postgresql/9.6/main/start.conf' maybe chmod 0755 'ppp' maybe chmod 0755 'ppp/ip-down.d' maybe chmod 0755 'ppp/ip-down.d/bind9' @@ -1145,6 +1297,8 @@ maybe chmod 0644 'python2.7/sitecustomize.py' maybe chmod 0755 'python3' maybe chmod 0755 'python3.4' maybe chmod 0644 'python3.4/sitecustomize.py' +maybe chmod 0755 'python3.5' +maybe chmod 0644 'python3.5/sitecustomize.py' maybe chmod 0644 'python3/debian_config' maybe chmod 0755 'rc.local' maybe chmod 0755 'rc0.d' @@ -1246,22 +1400,19 @@ maybe chmod 0755 'sysctl.d' maybe chmod 0644 'sysctl.d/30-postgresql-shm.conf' maybe chmod 0644 'sysctl.d/README.sysctl' maybe chmod 0755 'systemd' -maybe chmod 0644 'systemd/bootchart.conf' maybe chmod 0644 'systemd/journald.conf' maybe chmod 0644 'systemd/logind.conf' maybe chmod 0755 'systemd/network' -maybe chmod 0755 'systemd/ntp-units.d' +maybe chmod 0644 'systemd/network/50-virtio-kernel-names.link' +maybe chmod 0644 'systemd/network/99-default.link' maybe chmod 0644 'systemd/resolved.conf' maybe chmod 0755 'systemd/system' maybe chmod 0644 'systemd/system.conf' maybe chmod 0755 'systemd/system/default.target.wants' maybe chmod 0755 'systemd/system/getty.target.wants' -maybe chmod 0755 'systemd/system/halt.target.wants' -maybe chmod 0755 'systemd/system/local-fs.target.wants' maybe chmod 0755 'systemd/system/multi-user.target.wants' +maybe chmod 0755 'systemd/system/network-online.target.wants' maybe chmod 0755 'systemd/system/paths.target.wants' -maybe chmod 0755 'systemd/system/poweroff.target.wants' -maybe chmod 0755 'systemd/system/reboot.target.wants' maybe chmod 0755 'systemd/system/sockets.target.wants' maybe chmod 0755 'systemd/system/sysinit.target.wants' maybe chmod 0755 'systemd/system/timers.target.wants' @@ -1285,6 +1436,8 @@ maybe chmod 0644 'ufw/applications.d/bind9' maybe chmod 0644 'ufw/applications.d/openssh-server' maybe chmod 0644 'ufw/applications.d/postfix' maybe chmod 0600 'ulogd.conf' +maybe chmod 0755 'update-motd.d' +maybe chmod 0755 'update-motd.d/10-uname' maybe chmod 0644 'updatedb.conf' maybe chmod 0755 'vim' maybe chmod 0644 'vim/vimrc' diff --git a/.gitignore b/.gitignore index f1a53d8..9196cf5 100644 --- a/.gitignore +++ b/.gitignore @@ -43,7 +43,6 @@ cups/subscriptions.conf cups/subscriptions.conf.O fake-hwclock.data check_mk/logwatch.state -/motd # editor temp files *~ diff --git a/NetworkManager/dispatcher.d/20-chrony b/NetworkManager/dispatcher.d/20-chrony new file mode 100755 index 0000000..084aed6 --- /dev/null +++ b/NetworkManager/dispatcher.d/20-chrony @@ -0,0 +1,17 @@ +#!/bin/sh +# This is a NetworkManager dispatcher script for chronyd to set its NTP sources +# online/offline when a default route is configured/removed on the system. + +export LC_ALL=C + +if [ "$2" = "up" ]; then + /sbin/ip route list dev "$1" | grep -q '^default' && + /usr/bin/chronyc online > /dev/null 2>&1 +fi + +if [ "$2" = "down" ]; then + /sbin/ip route list | grep -q '^default' || + /usr/bin/chronyc offline > /dev/null 2>&1 +fi + +exit 0 diff --git a/X11/Xsession.d/90gpg-agent b/X11/Xsession.d/90gpg-agent new file mode 100644 index 0000000..8b45b05 --- /dev/null +++ b/X11/Xsession.d/90gpg-agent @@ -0,0 +1,22 @@ +# On systems with systemd running, we expect the agent to be launched +# via systemd's user mode (see +# /usr/lib/systemd/user/gpg-agent.{socket,service} and +# systemd.unit(5)). This allows systemd to clean up the agent +# automatically at logout. + +# If systemd is absent from your system, or you do not permit it to +# run in user mode, then you may need to manually launch gpg-agent +# from your session initialization with something like "gpgconf +# --launch gpg-agent" + +# Nonetheless, ssh and older versions of gpg require environment +# variables to be set in order to find the agent, so we will set those +# here. + +agent_sock=$(gpgconf --list-dirs agent-socket) +export GPG_AGENT_INFO=${agent_sock}:0:1 +if [ -n "$(gpgconf --list-options gpg-agent | \ + awk -F: '/^enable-ssh-support:/{ print $10 }')" ]; then + export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +fi + diff --git a/aliases.db b/aliases.db index 9221dc0..6a4126c 100644 Binary files a/aliases.db and b/aliases.db differ diff --git a/alternatives/ABORT.7.gz b/alternatives/ABORT.7.gz index b22dd75..49d1934 120000 --- a/alternatives/ABORT.7.gz +++ b/alternatives/ABORT.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ABORT.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ABORT.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_AGGREGATE.7.gz b/alternatives/ALTER_AGGREGATE.7.gz index 7b7b904..f8e96b7 120000 --- a/alternatives/ALTER_AGGREGATE.7.gz +++ b/alternatives/ALTER_AGGREGATE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_AGGREGATE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_AGGREGATE.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_COLLATION.7.gz b/alternatives/ALTER_COLLATION.7.gz index 4bc1b4e..4ab24a0 120000 --- a/alternatives/ALTER_COLLATION.7.gz +++ b/alternatives/ALTER_COLLATION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_COLLATION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_COLLATION.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_CONVERSION.7.gz b/alternatives/ALTER_CONVERSION.7.gz index 6e31c83..bd8f357 120000 --- a/alternatives/ALTER_CONVERSION.7.gz +++ b/alternatives/ALTER_CONVERSION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_CONVERSION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_CONVERSION.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_DATABASE.7.gz b/alternatives/ALTER_DATABASE.7.gz index 829c4d2..1d6c21c 120000 --- a/alternatives/ALTER_DATABASE.7.gz +++ b/alternatives/ALTER_DATABASE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_DATABASE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_DATABASE.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_DEFAULT_PRIVILEGES.7.gz b/alternatives/ALTER_DEFAULT_PRIVILEGES.7.gz index 1d6ad6e..3a14f88 120000 --- a/alternatives/ALTER_DEFAULT_PRIVILEGES.7.gz +++ b/alternatives/ALTER_DEFAULT_PRIVILEGES.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_DOMAIN.7.gz b/alternatives/ALTER_DOMAIN.7.gz index 03c0c43..91a19ef 120000 --- a/alternatives/ALTER_DOMAIN.7.gz +++ b/alternatives/ALTER_DOMAIN.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_DOMAIN.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_DOMAIN.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_EVENT_TRIGGER.7.gz b/alternatives/ALTER_EVENT_TRIGGER.7.gz index 959b591..b6e55c3 120000 --- a/alternatives/ALTER_EVENT_TRIGGER.7.gz +++ b/alternatives/ALTER_EVENT_TRIGGER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_EVENT_TRIGGER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_EVENT_TRIGGER.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_EXTENSION.7.gz b/alternatives/ALTER_EXTENSION.7.gz index e5434f8..327fb4c 120000 --- a/alternatives/ALTER_EXTENSION.7.gz +++ b/alternatives/ALTER_EXTENSION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_EXTENSION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_EXTENSION.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_FOREIGN_DATA_WRAPPER.7.gz b/alternatives/ALTER_FOREIGN_DATA_WRAPPER.7.gz index a022db2..284f5db 120000 --- a/alternatives/ALTER_FOREIGN_DATA_WRAPPER.7.gz +++ b/alternatives/ALTER_FOREIGN_DATA_WRAPPER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_FOREIGN_TABLE.7.gz b/alternatives/ALTER_FOREIGN_TABLE.7.gz index 3d6eda8..8a35372 120000 --- a/alternatives/ALTER_FOREIGN_TABLE.7.gz +++ b/alternatives/ALTER_FOREIGN_TABLE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_FOREIGN_TABLE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_FOREIGN_TABLE.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_FUNCTION.7.gz b/alternatives/ALTER_FUNCTION.7.gz index 4de0058..c7615fb 120000 --- a/alternatives/ALTER_FUNCTION.7.gz +++ b/alternatives/ALTER_FUNCTION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_FUNCTION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_FUNCTION.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_GROUP.7.gz b/alternatives/ALTER_GROUP.7.gz index 7d3ad01..d5e1302 120000 --- a/alternatives/ALTER_GROUP.7.gz +++ b/alternatives/ALTER_GROUP.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_GROUP.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_GROUP.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_INDEX.7.gz b/alternatives/ALTER_INDEX.7.gz index 5d6fd63..de516f5 120000 --- a/alternatives/ALTER_INDEX.7.gz +++ b/alternatives/ALTER_INDEX.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_INDEX.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_INDEX.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_LANGUAGE.7.gz b/alternatives/ALTER_LANGUAGE.7.gz index e7add9a..1b9dd3c 120000 --- a/alternatives/ALTER_LANGUAGE.7.gz +++ b/alternatives/ALTER_LANGUAGE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_LANGUAGE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_LANGUAGE.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_LARGE_OBJECT.7.gz b/alternatives/ALTER_LARGE_OBJECT.7.gz index c63221c..dd99b1c 120000 --- a/alternatives/ALTER_LARGE_OBJECT.7.gz +++ b/alternatives/ALTER_LARGE_OBJECT.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_LARGE_OBJECT.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_LARGE_OBJECT.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_MATERIALIZED_VIEW.7.gz b/alternatives/ALTER_MATERIALIZED_VIEW.7.gz index fa969f5..081f58b 120000 --- a/alternatives/ALTER_MATERIALIZED_VIEW.7.gz +++ b/alternatives/ALTER_MATERIALIZED_VIEW.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_MATERIALIZED_VIEW.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_MATERIALIZED_VIEW.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_OPERATOR.7.gz b/alternatives/ALTER_OPERATOR.7.gz index fbd089a..6a81c9a 120000 --- a/alternatives/ALTER_OPERATOR.7.gz +++ b/alternatives/ALTER_OPERATOR.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_OPERATOR.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_OPERATOR.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_OPERATOR_CLASS.7.gz b/alternatives/ALTER_OPERATOR_CLASS.7.gz index e98b64a..f24e2f3 120000 --- a/alternatives/ALTER_OPERATOR_CLASS.7.gz +++ b/alternatives/ALTER_OPERATOR_CLASS.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_OPERATOR_CLASS.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_OPERATOR_CLASS.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_OPERATOR_FAMILY.7.gz b/alternatives/ALTER_OPERATOR_FAMILY.7.gz index 907f7ef..8379ca2 120000 --- a/alternatives/ALTER_OPERATOR_FAMILY.7.gz +++ b/alternatives/ALTER_OPERATOR_FAMILY.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_OPERATOR_FAMILY.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_OPERATOR_FAMILY.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_POLICY.7.gz b/alternatives/ALTER_POLICY.7.gz new file mode 120000 index 0000000..33e56b5 --- /dev/null +++ b/alternatives/ALTER_POLICY.7.gz @@ -0,0 +1 @@ +/usr/share/postgresql/9.6/man/man7/ALTER_POLICY.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_ROLE.7.gz b/alternatives/ALTER_ROLE.7.gz index ba9f292..01ed6c2 120000 --- a/alternatives/ALTER_ROLE.7.gz +++ b/alternatives/ALTER_ROLE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_ROLE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_ROLE.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_RULE.7.gz b/alternatives/ALTER_RULE.7.gz index 250b6a4..9d66be0 120000 --- a/alternatives/ALTER_RULE.7.gz +++ b/alternatives/ALTER_RULE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_RULE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_RULE.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_SCHEMA.7.gz b/alternatives/ALTER_SCHEMA.7.gz index 89d0109..9c2c261 120000 --- a/alternatives/ALTER_SCHEMA.7.gz +++ b/alternatives/ALTER_SCHEMA.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_SCHEMA.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_SCHEMA.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_SEQUENCE.7.gz b/alternatives/ALTER_SEQUENCE.7.gz index a332d8f..48e4e63 120000 --- a/alternatives/ALTER_SEQUENCE.7.gz +++ b/alternatives/ALTER_SEQUENCE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_SEQUENCE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_SEQUENCE.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_SERVER.7.gz b/alternatives/ALTER_SERVER.7.gz index 2a54e83..b8f10f9 120000 --- a/alternatives/ALTER_SERVER.7.gz +++ b/alternatives/ALTER_SERVER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_SERVER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_SERVER.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_SYSTEM.7.gz b/alternatives/ALTER_SYSTEM.7.gz index c017ab2..6d40617 120000 --- a/alternatives/ALTER_SYSTEM.7.gz +++ b/alternatives/ALTER_SYSTEM.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_SYSTEM.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_SYSTEM.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_TABLE.7.gz b/alternatives/ALTER_TABLE.7.gz index 175b69f..d98f2a7 120000 --- a/alternatives/ALTER_TABLE.7.gz +++ b/alternatives/ALTER_TABLE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_TABLE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_TABLE.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_TABLESPACE.7.gz b/alternatives/ALTER_TABLESPACE.7.gz index 19ba4e7..96babb5 120000 --- a/alternatives/ALTER_TABLESPACE.7.gz +++ b/alternatives/ALTER_TABLESPACE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_TABLESPACE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_TABLESPACE.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz b/alternatives/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz index d40ac6e..5bb50b5 120000 --- a/alternatives/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz +++ b/alternatives/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_TEXT_SEARCH_DICTIONARY.7.gz b/alternatives/ALTER_TEXT_SEARCH_DICTIONARY.7.gz index dc2925f..cb1ebe2 120000 --- a/alternatives/ALTER_TEXT_SEARCH_DICTIONARY.7.gz +++ b/alternatives/ALTER_TEXT_SEARCH_DICTIONARY.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_TEXT_SEARCH_PARSER.7.gz b/alternatives/ALTER_TEXT_SEARCH_PARSER.7.gz index 058b851..4298301 120000 --- a/alternatives/ALTER_TEXT_SEARCH_PARSER.7.gz +++ b/alternatives/ALTER_TEXT_SEARCH_PARSER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_TEXT_SEARCH_TEMPLATE.7.gz b/alternatives/ALTER_TEXT_SEARCH_TEMPLATE.7.gz index 1d86311..0006929 120000 --- a/alternatives/ALTER_TEXT_SEARCH_TEMPLATE.7.gz +++ b/alternatives/ALTER_TEXT_SEARCH_TEMPLATE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_TRIGGER.7.gz b/alternatives/ALTER_TRIGGER.7.gz index fec53d6..b9fe343 120000 --- a/alternatives/ALTER_TRIGGER.7.gz +++ b/alternatives/ALTER_TRIGGER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_TRIGGER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_TRIGGER.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_TYPE.7.gz b/alternatives/ALTER_TYPE.7.gz index d0a6683..750b5c6 120000 --- a/alternatives/ALTER_TYPE.7.gz +++ b/alternatives/ALTER_TYPE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_TYPE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_TYPE.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_USER.7.gz b/alternatives/ALTER_USER.7.gz index fa50a7f..a7e9d76 120000 --- a/alternatives/ALTER_USER.7.gz +++ b/alternatives/ALTER_USER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_USER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_USER.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_USER_MAPPING.7.gz b/alternatives/ALTER_USER_MAPPING.7.gz index 43f452b..8960a35 120000 --- a/alternatives/ALTER_USER_MAPPING.7.gz +++ b/alternatives/ALTER_USER_MAPPING.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_USER_MAPPING.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_USER_MAPPING.7.gz \ No newline at end of file diff --git a/alternatives/ALTER_VIEW.7.gz b/alternatives/ALTER_VIEW.7.gz index f938b5d..d3ad684 120000 --- a/alternatives/ALTER_VIEW.7.gz +++ b/alternatives/ALTER_VIEW.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ALTER_VIEW.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ALTER_VIEW.7.gz \ No newline at end of file diff --git a/alternatives/ANALYZE.7.gz b/alternatives/ANALYZE.7.gz index d6acd1f..d043e3d 120000 --- a/alternatives/ANALYZE.7.gz +++ b/alternatives/ANALYZE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ANALYZE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ANALYZE.7.gz \ No newline at end of file diff --git a/alternatives/BEGIN.7.gz b/alternatives/BEGIN.7.gz index 8e0def0..ee7623f 120000 --- a/alternatives/BEGIN.7.gz +++ b/alternatives/BEGIN.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/BEGIN.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/BEGIN.7.gz \ No newline at end of file diff --git a/alternatives/CHECKPOINT.7.gz b/alternatives/CHECKPOINT.7.gz index f08e9cf..c93b7bc 120000 --- a/alternatives/CHECKPOINT.7.gz +++ b/alternatives/CHECKPOINT.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CHECKPOINT.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CHECKPOINT.7.gz \ No newline at end of file diff --git a/alternatives/CLOSE.7.gz b/alternatives/CLOSE.7.gz index 6da2228..d9c6bce 120000 --- a/alternatives/CLOSE.7.gz +++ b/alternatives/CLOSE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CLOSE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CLOSE.7.gz \ No newline at end of file diff --git a/alternatives/CLUSTER.7.gz b/alternatives/CLUSTER.7.gz index 1583dcd..05b53b5 120000 --- a/alternatives/CLUSTER.7.gz +++ b/alternatives/CLUSTER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CLUSTER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CLUSTER.7.gz \ No newline at end of file diff --git a/alternatives/COMMENT.7.gz b/alternatives/COMMENT.7.gz index 327c674..c434e3f 120000 --- a/alternatives/COMMENT.7.gz +++ b/alternatives/COMMENT.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/COMMENT.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/COMMENT.7.gz \ No newline at end of file diff --git a/alternatives/COMMIT.7.gz b/alternatives/COMMIT.7.gz index 3841cdf..7c834ef 120000 --- a/alternatives/COMMIT.7.gz +++ b/alternatives/COMMIT.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/COMMIT.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/COMMIT.7.gz \ No newline at end of file diff --git a/alternatives/COMMIT_PREPARED.7.gz b/alternatives/COMMIT_PREPARED.7.gz index 1752702..b02254c 120000 --- a/alternatives/COMMIT_PREPARED.7.gz +++ b/alternatives/COMMIT_PREPARED.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/COMMIT_PREPARED.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/COMMIT_PREPARED.7.gz \ No newline at end of file diff --git a/alternatives/COPY.7.gz b/alternatives/COPY.7.gz index dc83c5b..c662925 120000 --- a/alternatives/COPY.7.gz +++ b/alternatives/COPY.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/COPY.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/COPY.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_ACCESS_METHOD.7.gz b/alternatives/CREATE_ACCESS_METHOD.7.gz new file mode 120000 index 0000000..e295653 --- /dev/null +++ b/alternatives/CREATE_ACCESS_METHOD.7.gz @@ -0,0 +1 @@ +/usr/share/postgresql/9.6/man/man7/CREATE_ACCESS_METHOD.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_AGGREGATE.7.gz b/alternatives/CREATE_AGGREGATE.7.gz index bebecf4..9b3411b 120000 --- a/alternatives/CREATE_AGGREGATE.7.gz +++ b/alternatives/CREATE_AGGREGATE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_AGGREGATE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_AGGREGATE.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_CAST.7.gz b/alternatives/CREATE_CAST.7.gz index 5615732..fa3a0d8 120000 --- a/alternatives/CREATE_CAST.7.gz +++ b/alternatives/CREATE_CAST.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_CAST.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_CAST.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_COLLATION.7.gz b/alternatives/CREATE_COLLATION.7.gz index d2ece40..7a793d2 120000 --- a/alternatives/CREATE_COLLATION.7.gz +++ b/alternatives/CREATE_COLLATION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_COLLATION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_COLLATION.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_CONVERSION.7.gz b/alternatives/CREATE_CONVERSION.7.gz index 71cb16c..b60a190 120000 --- a/alternatives/CREATE_CONVERSION.7.gz +++ b/alternatives/CREATE_CONVERSION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_CONVERSION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_CONVERSION.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_DATABASE.7.gz b/alternatives/CREATE_DATABASE.7.gz index 718ee5c..e5b495c 120000 --- a/alternatives/CREATE_DATABASE.7.gz +++ b/alternatives/CREATE_DATABASE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_DATABASE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_DATABASE.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_DOMAIN.7.gz b/alternatives/CREATE_DOMAIN.7.gz index 2abc4b1..ca2159c 120000 --- a/alternatives/CREATE_DOMAIN.7.gz +++ b/alternatives/CREATE_DOMAIN.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_DOMAIN.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_DOMAIN.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_EVENT_TRIGGER.7.gz b/alternatives/CREATE_EVENT_TRIGGER.7.gz index 9cbaec4..c8ca999 120000 --- a/alternatives/CREATE_EVENT_TRIGGER.7.gz +++ b/alternatives/CREATE_EVENT_TRIGGER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_EVENT_TRIGGER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_EVENT_TRIGGER.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_EXTENSION.7.gz b/alternatives/CREATE_EXTENSION.7.gz index db83fc2..04588ae 120000 --- a/alternatives/CREATE_EXTENSION.7.gz +++ b/alternatives/CREATE_EXTENSION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_EXTENSION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_EXTENSION.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_FOREIGN_DATA_WRAPPER.7.gz b/alternatives/CREATE_FOREIGN_DATA_WRAPPER.7.gz index 0439f59..bd14bcc 120000 --- a/alternatives/CREATE_FOREIGN_DATA_WRAPPER.7.gz +++ b/alternatives/CREATE_FOREIGN_DATA_WRAPPER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_FOREIGN_TABLE.7.gz b/alternatives/CREATE_FOREIGN_TABLE.7.gz index 44b105d..35409dc 120000 --- a/alternatives/CREATE_FOREIGN_TABLE.7.gz +++ b/alternatives/CREATE_FOREIGN_TABLE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_FOREIGN_TABLE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_FOREIGN_TABLE.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_FUNCTION.7.gz b/alternatives/CREATE_FUNCTION.7.gz index 9403741..c50ddc4 120000 --- a/alternatives/CREATE_FUNCTION.7.gz +++ b/alternatives/CREATE_FUNCTION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_FUNCTION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_FUNCTION.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_GROUP.7.gz b/alternatives/CREATE_GROUP.7.gz index 88d8dc2..daea7c8 120000 --- a/alternatives/CREATE_GROUP.7.gz +++ b/alternatives/CREATE_GROUP.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_GROUP.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_GROUP.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_INDEX.7.gz b/alternatives/CREATE_INDEX.7.gz index 57df7c4..8944491 120000 --- a/alternatives/CREATE_INDEX.7.gz +++ b/alternatives/CREATE_INDEX.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_INDEX.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_INDEX.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_LANGUAGE.7.gz b/alternatives/CREATE_LANGUAGE.7.gz index 5bc8608..b0c3973 120000 --- a/alternatives/CREATE_LANGUAGE.7.gz +++ b/alternatives/CREATE_LANGUAGE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_LANGUAGE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_LANGUAGE.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_MATERIALIZED_VIEW.7.gz b/alternatives/CREATE_MATERIALIZED_VIEW.7.gz index 04bd372..6c6d7a1 120000 --- a/alternatives/CREATE_MATERIALIZED_VIEW.7.gz +++ b/alternatives/CREATE_MATERIALIZED_VIEW.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_MATERIALIZED_VIEW.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_MATERIALIZED_VIEW.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_OPERATOR.7.gz b/alternatives/CREATE_OPERATOR.7.gz index dc8b6f5..7882287 120000 --- a/alternatives/CREATE_OPERATOR.7.gz +++ b/alternatives/CREATE_OPERATOR.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_OPERATOR.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_OPERATOR.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_OPERATOR_CLASS.7.gz b/alternatives/CREATE_OPERATOR_CLASS.7.gz index 5505df9..0cdec30 120000 --- a/alternatives/CREATE_OPERATOR_CLASS.7.gz +++ b/alternatives/CREATE_OPERATOR_CLASS.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_OPERATOR_CLASS.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_OPERATOR_CLASS.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_OPERATOR_FAMILY.7.gz b/alternatives/CREATE_OPERATOR_FAMILY.7.gz index d4a9e9a..b06cd89 120000 --- a/alternatives/CREATE_OPERATOR_FAMILY.7.gz +++ b/alternatives/CREATE_OPERATOR_FAMILY.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_OPERATOR_FAMILY.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_OPERATOR_FAMILY.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_POLICY.7.gz b/alternatives/CREATE_POLICY.7.gz new file mode 120000 index 0000000..89b65cc --- /dev/null +++ b/alternatives/CREATE_POLICY.7.gz @@ -0,0 +1 @@ +/usr/share/postgresql/9.6/man/man7/CREATE_POLICY.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_ROLE.7.gz b/alternatives/CREATE_ROLE.7.gz index 4927e6e..204eadd 120000 --- a/alternatives/CREATE_ROLE.7.gz +++ b/alternatives/CREATE_ROLE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_ROLE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_ROLE.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_RULE.7.gz b/alternatives/CREATE_RULE.7.gz index cbf7ba9..1a0c9b9 120000 --- a/alternatives/CREATE_RULE.7.gz +++ b/alternatives/CREATE_RULE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_RULE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_RULE.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_SCHEMA.7.gz b/alternatives/CREATE_SCHEMA.7.gz index 2148856..58f1870 120000 --- a/alternatives/CREATE_SCHEMA.7.gz +++ b/alternatives/CREATE_SCHEMA.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_SCHEMA.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_SCHEMA.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_SEQUENCE.7.gz b/alternatives/CREATE_SEQUENCE.7.gz index 08227c8..2ac9c29 120000 --- a/alternatives/CREATE_SEQUENCE.7.gz +++ b/alternatives/CREATE_SEQUENCE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_SEQUENCE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_SEQUENCE.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_SERVER.7.gz b/alternatives/CREATE_SERVER.7.gz index 0a70736..fbd7810 120000 --- a/alternatives/CREATE_SERVER.7.gz +++ b/alternatives/CREATE_SERVER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_SERVER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_SERVER.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_TABLE.7.gz b/alternatives/CREATE_TABLE.7.gz index 9f513f8..bb117b2 120000 --- a/alternatives/CREATE_TABLE.7.gz +++ b/alternatives/CREATE_TABLE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_TABLE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_TABLE.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_TABLESPACE.7.gz b/alternatives/CREATE_TABLESPACE.7.gz index e11335b..0327944 120000 --- a/alternatives/CREATE_TABLESPACE.7.gz +++ b/alternatives/CREATE_TABLESPACE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_TABLESPACE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_TABLESPACE.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_TABLE_AS.7.gz b/alternatives/CREATE_TABLE_AS.7.gz index 601b1fa..48c8c22 120000 --- a/alternatives/CREATE_TABLE_AS.7.gz +++ b/alternatives/CREATE_TABLE_AS.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_TABLE_AS.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_TABLE_AS.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz b/alternatives/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz index ccc6194..548eb30 120000 --- a/alternatives/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz +++ b/alternatives/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_TEXT_SEARCH_DICTIONARY.7.gz b/alternatives/CREATE_TEXT_SEARCH_DICTIONARY.7.gz index 7e3c48a..2a8ee49 120000 --- a/alternatives/CREATE_TEXT_SEARCH_DICTIONARY.7.gz +++ b/alternatives/CREATE_TEXT_SEARCH_DICTIONARY.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_TEXT_SEARCH_PARSER.7.gz b/alternatives/CREATE_TEXT_SEARCH_PARSER.7.gz index da36d4d..ea1146c 120000 --- a/alternatives/CREATE_TEXT_SEARCH_PARSER.7.gz +++ b/alternatives/CREATE_TEXT_SEARCH_PARSER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_TEXT_SEARCH_TEMPLATE.7.gz b/alternatives/CREATE_TEXT_SEARCH_TEMPLATE.7.gz index 2525fc0..2237491 120000 --- a/alternatives/CREATE_TEXT_SEARCH_TEMPLATE.7.gz +++ b/alternatives/CREATE_TEXT_SEARCH_TEMPLATE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_TRANSFORM.7.gz b/alternatives/CREATE_TRANSFORM.7.gz new file mode 120000 index 0000000..38b24cd --- /dev/null +++ b/alternatives/CREATE_TRANSFORM.7.gz @@ -0,0 +1 @@ +/usr/share/postgresql/9.6/man/man7/CREATE_TRANSFORM.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_TRIGGER.7.gz b/alternatives/CREATE_TRIGGER.7.gz index 1a95d81..5d153d3 120000 --- a/alternatives/CREATE_TRIGGER.7.gz +++ b/alternatives/CREATE_TRIGGER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_TRIGGER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_TRIGGER.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_TYPE.7.gz b/alternatives/CREATE_TYPE.7.gz index 128cecd..cfafa91 120000 --- a/alternatives/CREATE_TYPE.7.gz +++ b/alternatives/CREATE_TYPE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_TYPE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_TYPE.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_USER.7.gz b/alternatives/CREATE_USER.7.gz index 7e23810..5bc1d60 120000 --- a/alternatives/CREATE_USER.7.gz +++ b/alternatives/CREATE_USER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_USER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_USER.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_USER_MAPPING.7.gz b/alternatives/CREATE_USER_MAPPING.7.gz index 5d260b1..6a4e5bb 120000 --- a/alternatives/CREATE_USER_MAPPING.7.gz +++ b/alternatives/CREATE_USER_MAPPING.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_USER_MAPPING.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_USER_MAPPING.7.gz \ No newline at end of file diff --git a/alternatives/CREATE_VIEW.7.gz b/alternatives/CREATE_VIEW.7.gz index ac7c4af..17d4ea4 120000 --- a/alternatives/CREATE_VIEW.7.gz +++ b/alternatives/CREATE_VIEW.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/CREATE_VIEW.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/CREATE_VIEW.7.gz \ No newline at end of file diff --git a/alternatives/DEALLOCATE.7.gz b/alternatives/DEALLOCATE.7.gz index baaaa5b..73f2da1 120000 --- a/alternatives/DEALLOCATE.7.gz +++ b/alternatives/DEALLOCATE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DEALLOCATE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DEALLOCATE.7.gz \ No newline at end of file diff --git a/alternatives/DECLARE.7.gz b/alternatives/DECLARE.7.gz index 24965ef..91e66dd 120000 --- a/alternatives/DECLARE.7.gz +++ b/alternatives/DECLARE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DECLARE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DECLARE.7.gz \ No newline at end of file diff --git a/alternatives/DELETE.7.gz b/alternatives/DELETE.7.gz index d6eb4c0..1b7c495 120000 --- a/alternatives/DELETE.7.gz +++ b/alternatives/DELETE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DELETE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DELETE.7.gz \ No newline at end of file diff --git a/alternatives/DISCARD.7.gz b/alternatives/DISCARD.7.gz index 5455389..5393096 120000 --- a/alternatives/DISCARD.7.gz +++ b/alternatives/DISCARD.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DISCARD.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DISCARD.7.gz \ No newline at end of file diff --git a/alternatives/DO.7.gz b/alternatives/DO.7.gz index 252dc25..ad86bed 120000 --- a/alternatives/DO.7.gz +++ b/alternatives/DO.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DO.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DO.7.gz \ No newline at end of file diff --git a/alternatives/DROP_ACCESS_METHOD.7.gz b/alternatives/DROP_ACCESS_METHOD.7.gz new file mode 120000 index 0000000..731a2fe --- /dev/null +++ b/alternatives/DROP_ACCESS_METHOD.7.gz @@ -0,0 +1 @@ +/usr/share/postgresql/9.6/man/man7/DROP_ACCESS_METHOD.7.gz \ No newline at end of file diff --git a/alternatives/DROP_AGGREGATE.7.gz b/alternatives/DROP_AGGREGATE.7.gz index 3735fc6..f827c65 120000 --- a/alternatives/DROP_AGGREGATE.7.gz +++ b/alternatives/DROP_AGGREGATE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_AGGREGATE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_AGGREGATE.7.gz \ No newline at end of file diff --git a/alternatives/DROP_CAST.7.gz b/alternatives/DROP_CAST.7.gz index be23f4e..8bdb3c2 120000 --- a/alternatives/DROP_CAST.7.gz +++ b/alternatives/DROP_CAST.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_CAST.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_CAST.7.gz \ No newline at end of file diff --git a/alternatives/DROP_COLLATION.7.gz b/alternatives/DROP_COLLATION.7.gz index b1374b4..692e1a0 120000 --- a/alternatives/DROP_COLLATION.7.gz +++ b/alternatives/DROP_COLLATION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_COLLATION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_COLLATION.7.gz \ No newline at end of file diff --git a/alternatives/DROP_CONVERSION.7.gz b/alternatives/DROP_CONVERSION.7.gz index 09163a5..a9c8a90 120000 --- a/alternatives/DROP_CONVERSION.7.gz +++ b/alternatives/DROP_CONVERSION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_CONVERSION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_CONVERSION.7.gz \ No newline at end of file diff --git a/alternatives/DROP_DATABASE.7.gz b/alternatives/DROP_DATABASE.7.gz index fa9c628..611bf21 120000 --- a/alternatives/DROP_DATABASE.7.gz +++ b/alternatives/DROP_DATABASE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_DATABASE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_DATABASE.7.gz \ No newline at end of file diff --git a/alternatives/DROP_DOMAIN.7.gz b/alternatives/DROP_DOMAIN.7.gz index 43b9912..2e5d7a3 120000 --- a/alternatives/DROP_DOMAIN.7.gz +++ b/alternatives/DROP_DOMAIN.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_DOMAIN.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_DOMAIN.7.gz \ No newline at end of file diff --git a/alternatives/DROP_EVENT_TRIGGER.7.gz b/alternatives/DROP_EVENT_TRIGGER.7.gz index 6e11437..1ac0cfb 120000 --- a/alternatives/DROP_EVENT_TRIGGER.7.gz +++ b/alternatives/DROP_EVENT_TRIGGER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_EVENT_TRIGGER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_EVENT_TRIGGER.7.gz \ No newline at end of file diff --git a/alternatives/DROP_EXTENSION.7.gz b/alternatives/DROP_EXTENSION.7.gz index a4825f1..c60ab7f 120000 --- a/alternatives/DROP_EXTENSION.7.gz +++ b/alternatives/DROP_EXTENSION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_EXTENSION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_EXTENSION.7.gz \ No newline at end of file diff --git a/alternatives/DROP_FOREIGN_DATA_WRAPPER.7.gz b/alternatives/DROP_FOREIGN_DATA_WRAPPER.7.gz index 1c66bd3..f39e904 120000 --- a/alternatives/DROP_FOREIGN_DATA_WRAPPER.7.gz +++ b/alternatives/DROP_FOREIGN_DATA_WRAPPER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz \ No newline at end of file diff --git a/alternatives/DROP_FOREIGN_TABLE.7.gz b/alternatives/DROP_FOREIGN_TABLE.7.gz index a9f6362..8cd96e1 120000 --- a/alternatives/DROP_FOREIGN_TABLE.7.gz +++ b/alternatives/DROP_FOREIGN_TABLE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_FOREIGN_TABLE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_FOREIGN_TABLE.7.gz \ No newline at end of file diff --git a/alternatives/DROP_FUNCTION.7.gz b/alternatives/DROP_FUNCTION.7.gz index 1ad1bad..0deb55c 120000 --- a/alternatives/DROP_FUNCTION.7.gz +++ b/alternatives/DROP_FUNCTION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_FUNCTION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_FUNCTION.7.gz \ No newline at end of file diff --git a/alternatives/DROP_GROUP.7.gz b/alternatives/DROP_GROUP.7.gz index 2e06165..41362c9 120000 --- a/alternatives/DROP_GROUP.7.gz +++ b/alternatives/DROP_GROUP.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_GROUP.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_GROUP.7.gz \ No newline at end of file diff --git a/alternatives/DROP_INDEX.7.gz b/alternatives/DROP_INDEX.7.gz index 166b42b..d7070e5 120000 --- a/alternatives/DROP_INDEX.7.gz +++ b/alternatives/DROP_INDEX.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_INDEX.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_INDEX.7.gz \ No newline at end of file diff --git a/alternatives/DROP_LANGUAGE.7.gz b/alternatives/DROP_LANGUAGE.7.gz index 705e822..9490f01 120000 --- a/alternatives/DROP_LANGUAGE.7.gz +++ b/alternatives/DROP_LANGUAGE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_LANGUAGE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_LANGUAGE.7.gz \ No newline at end of file diff --git a/alternatives/DROP_MATERIALIZED_VIEW.7.gz b/alternatives/DROP_MATERIALIZED_VIEW.7.gz index c295175..b00fc9b 120000 --- a/alternatives/DROP_MATERIALIZED_VIEW.7.gz +++ b/alternatives/DROP_MATERIALIZED_VIEW.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_MATERIALIZED_VIEW.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_MATERIALIZED_VIEW.7.gz \ No newline at end of file diff --git a/alternatives/DROP_OPERATOR.7.gz b/alternatives/DROP_OPERATOR.7.gz index c11bffb..d36096d 120000 --- a/alternatives/DROP_OPERATOR.7.gz +++ b/alternatives/DROP_OPERATOR.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_OPERATOR.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_OPERATOR.7.gz \ No newline at end of file diff --git a/alternatives/DROP_OPERATOR_CLASS.7.gz b/alternatives/DROP_OPERATOR_CLASS.7.gz index 74f4444..59898ed 120000 --- a/alternatives/DROP_OPERATOR_CLASS.7.gz +++ b/alternatives/DROP_OPERATOR_CLASS.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_OPERATOR_CLASS.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_OPERATOR_CLASS.7.gz \ No newline at end of file diff --git a/alternatives/DROP_OPERATOR_FAMILY.7.gz b/alternatives/DROP_OPERATOR_FAMILY.7.gz index f309b77..c158bd3 120000 --- a/alternatives/DROP_OPERATOR_FAMILY.7.gz +++ b/alternatives/DROP_OPERATOR_FAMILY.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_OPERATOR_FAMILY.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_OPERATOR_FAMILY.7.gz \ No newline at end of file diff --git a/alternatives/DROP_OWNED.7.gz b/alternatives/DROP_OWNED.7.gz index 1e338c4..df970b7 120000 --- a/alternatives/DROP_OWNED.7.gz +++ b/alternatives/DROP_OWNED.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_OWNED.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_OWNED.7.gz \ No newline at end of file diff --git a/alternatives/DROP_POLICY.7.gz b/alternatives/DROP_POLICY.7.gz new file mode 120000 index 0000000..5920b77 --- /dev/null +++ b/alternatives/DROP_POLICY.7.gz @@ -0,0 +1 @@ +/usr/share/postgresql/9.6/man/man7/DROP_POLICY.7.gz \ No newline at end of file diff --git a/alternatives/DROP_ROLE.7.gz b/alternatives/DROP_ROLE.7.gz index 53bb602..d67829b 120000 --- a/alternatives/DROP_ROLE.7.gz +++ b/alternatives/DROP_ROLE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_ROLE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_ROLE.7.gz \ No newline at end of file diff --git a/alternatives/DROP_RULE.7.gz b/alternatives/DROP_RULE.7.gz index b159ea4..7d088f8 120000 --- a/alternatives/DROP_RULE.7.gz +++ b/alternatives/DROP_RULE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_RULE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_RULE.7.gz \ No newline at end of file diff --git a/alternatives/DROP_SCHEMA.7.gz b/alternatives/DROP_SCHEMA.7.gz index 5416f0a..0042b82 120000 --- a/alternatives/DROP_SCHEMA.7.gz +++ b/alternatives/DROP_SCHEMA.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_SCHEMA.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_SCHEMA.7.gz \ No newline at end of file diff --git a/alternatives/DROP_SEQUENCE.7.gz b/alternatives/DROP_SEQUENCE.7.gz index a24312f..037623b 120000 --- a/alternatives/DROP_SEQUENCE.7.gz +++ b/alternatives/DROP_SEQUENCE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_SEQUENCE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_SEQUENCE.7.gz \ No newline at end of file diff --git a/alternatives/DROP_SERVER.7.gz b/alternatives/DROP_SERVER.7.gz index 7138463..b91b353 120000 --- a/alternatives/DROP_SERVER.7.gz +++ b/alternatives/DROP_SERVER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_SERVER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_SERVER.7.gz \ No newline at end of file diff --git a/alternatives/DROP_TABLE.7.gz b/alternatives/DROP_TABLE.7.gz index 6b8cb20..74fb3b6 120000 --- a/alternatives/DROP_TABLE.7.gz +++ b/alternatives/DROP_TABLE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_TABLE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_TABLE.7.gz \ No newline at end of file diff --git a/alternatives/DROP_TABLESPACE.7.gz b/alternatives/DROP_TABLESPACE.7.gz index 33f890b..040d76f 120000 --- a/alternatives/DROP_TABLESPACE.7.gz +++ b/alternatives/DROP_TABLESPACE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_TABLESPACE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_TABLESPACE.7.gz \ No newline at end of file diff --git a/alternatives/DROP_TEXT_SEARCH_CONFIGURATION.7.gz b/alternatives/DROP_TEXT_SEARCH_CONFIGURATION.7.gz index 94526ae..fb48ad4 120000 --- a/alternatives/DROP_TEXT_SEARCH_CONFIGURATION.7.gz +++ b/alternatives/DROP_TEXT_SEARCH_CONFIGURATION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz \ No newline at end of file diff --git a/alternatives/DROP_TEXT_SEARCH_DICTIONARY.7.gz b/alternatives/DROP_TEXT_SEARCH_DICTIONARY.7.gz index 6ef52a7..2241dd8 120000 --- a/alternatives/DROP_TEXT_SEARCH_DICTIONARY.7.gz +++ b/alternatives/DROP_TEXT_SEARCH_DICTIONARY.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz \ No newline at end of file diff --git a/alternatives/DROP_TEXT_SEARCH_PARSER.7.gz b/alternatives/DROP_TEXT_SEARCH_PARSER.7.gz index 3f90f89..d6a4282 120000 --- a/alternatives/DROP_TEXT_SEARCH_PARSER.7.gz +++ b/alternatives/DROP_TEXT_SEARCH_PARSER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_TEXT_SEARCH_PARSER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_TEXT_SEARCH_PARSER.7.gz \ No newline at end of file diff --git a/alternatives/DROP_TEXT_SEARCH_TEMPLATE.7.gz b/alternatives/DROP_TEXT_SEARCH_TEMPLATE.7.gz index 2e09eed..29b4689 120000 --- a/alternatives/DROP_TEXT_SEARCH_TEMPLATE.7.gz +++ b/alternatives/DROP_TEXT_SEARCH_TEMPLATE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz \ No newline at end of file diff --git a/alternatives/DROP_TRANSFORM.7.gz b/alternatives/DROP_TRANSFORM.7.gz new file mode 120000 index 0000000..8803ab2 --- /dev/null +++ b/alternatives/DROP_TRANSFORM.7.gz @@ -0,0 +1 @@ +/usr/share/postgresql/9.6/man/man7/DROP_TRANSFORM.7.gz \ No newline at end of file diff --git a/alternatives/DROP_TRIGGER.7.gz b/alternatives/DROP_TRIGGER.7.gz index 525d817..294a3c6 120000 --- a/alternatives/DROP_TRIGGER.7.gz +++ b/alternatives/DROP_TRIGGER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_TRIGGER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_TRIGGER.7.gz \ No newline at end of file diff --git a/alternatives/DROP_TYPE.7.gz b/alternatives/DROP_TYPE.7.gz index 4e0a2d0..ce028ca 120000 --- a/alternatives/DROP_TYPE.7.gz +++ b/alternatives/DROP_TYPE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_TYPE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_TYPE.7.gz \ No newline at end of file diff --git a/alternatives/DROP_USER.7.gz b/alternatives/DROP_USER.7.gz index 739dba7..1738142 120000 --- a/alternatives/DROP_USER.7.gz +++ b/alternatives/DROP_USER.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_USER.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_USER.7.gz \ No newline at end of file diff --git a/alternatives/DROP_USER_MAPPING.7.gz b/alternatives/DROP_USER_MAPPING.7.gz index 80d6d10..a7bc9ca 120000 --- a/alternatives/DROP_USER_MAPPING.7.gz +++ b/alternatives/DROP_USER_MAPPING.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_USER_MAPPING.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_USER_MAPPING.7.gz \ No newline at end of file diff --git a/alternatives/DROP_VIEW.7.gz b/alternatives/DROP_VIEW.7.gz index 5660386..ef64715 120000 --- a/alternatives/DROP_VIEW.7.gz +++ b/alternatives/DROP_VIEW.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/DROP_VIEW.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/DROP_VIEW.7.gz \ No newline at end of file diff --git a/alternatives/END.7.gz b/alternatives/END.7.gz index 3bedf0b..90cd361 120000 --- a/alternatives/END.7.gz +++ b/alternatives/END.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/END.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/END.7.gz \ No newline at end of file diff --git a/alternatives/EXECUTE.7.gz b/alternatives/EXECUTE.7.gz index 39c6553..da00f07 120000 --- a/alternatives/EXECUTE.7.gz +++ b/alternatives/EXECUTE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/EXECUTE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/EXECUTE.7.gz \ No newline at end of file diff --git a/alternatives/EXPLAIN.7.gz b/alternatives/EXPLAIN.7.gz index 52ac74b..253b3ac 120000 --- a/alternatives/EXPLAIN.7.gz +++ b/alternatives/EXPLAIN.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/EXPLAIN.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/EXPLAIN.7.gz \ No newline at end of file diff --git a/alternatives/FETCH.7.gz b/alternatives/FETCH.7.gz index 0c2341a..39bca52 120000 --- a/alternatives/FETCH.7.gz +++ b/alternatives/FETCH.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/FETCH.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/FETCH.7.gz \ No newline at end of file diff --git a/alternatives/GRANT.7.gz b/alternatives/GRANT.7.gz index f681d96..8128293 120000 --- a/alternatives/GRANT.7.gz +++ b/alternatives/GRANT.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/GRANT.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/GRANT.7.gz \ No newline at end of file diff --git a/alternatives/IMPORT_FOREIGN_SCHEMA.7.gz b/alternatives/IMPORT_FOREIGN_SCHEMA.7.gz new file mode 120000 index 0000000..c548ef8 --- /dev/null +++ b/alternatives/IMPORT_FOREIGN_SCHEMA.7.gz @@ -0,0 +1 @@ +/usr/share/postgresql/9.6/man/man7/IMPORT_FOREIGN_SCHEMA.7.gz \ No newline at end of file diff --git a/alternatives/INSERT.7.gz b/alternatives/INSERT.7.gz index f42da70..e7d1018 120000 --- a/alternatives/INSERT.7.gz +++ b/alternatives/INSERT.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/INSERT.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/INSERT.7.gz \ No newline at end of file diff --git a/alternatives/LISTEN.7.gz b/alternatives/LISTEN.7.gz index d5eac8a..4636a9f 120000 --- a/alternatives/LISTEN.7.gz +++ b/alternatives/LISTEN.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/LISTEN.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/LISTEN.7.gz \ No newline at end of file diff --git a/alternatives/LOAD.7.gz b/alternatives/LOAD.7.gz index ad55fa3..557d5c3 120000 --- a/alternatives/LOAD.7.gz +++ b/alternatives/LOAD.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/LOAD.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/LOAD.7.gz \ No newline at end of file diff --git a/alternatives/LOCK.7.gz b/alternatives/LOCK.7.gz index 59ea962..cb3537b 120000 --- a/alternatives/LOCK.7.gz +++ b/alternatives/LOCK.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/LOCK.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/LOCK.7.gz \ No newline at end of file diff --git a/alternatives/MOVE.7.gz b/alternatives/MOVE.7.gz index f8db099..8229700 120000 --- a/alternatives/MOVE.7.gz +++ b/alternatives/MOVE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/MOVE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/MOVE.7.gz \ No newline at end of file diff --git a/alternatives/NOTIFY.7.gz b/alternatives/NOTIFY.7.gz index bdaf0f1..96a2ad9 120000 --- a/alternatives/NOTIFY.7.gz +++ b/alternatives/NOTIFY.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/NOTIFY.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/NOTIFY.7.gz \ No newline at end of file diff --git a/alternatives/PREPARE.7.gz b/alternatives/PREPARE.7.gz index 53bbeb0..6415a0b 120000 --- a/alternatives/PREPARE.7.gz +++ b/alternatives/PREPARE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/PREPARE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/PREPARE.7.gz \ No newline at end of file diff --git a/alternatives/PREPARE_TRANSACTION.7.gz b/alternatives/PREPARE_TRANSACTION.7.gz index 098ee29..52fd9d4 120000 --- a/alternatives/PREPARE_TRANSACTION.7.gz +++ b/alternatives/PREPARE_TRANSACTION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/PREPARE_TRANSACTION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/PREPARE_TRANSACTION.7.gz \ No newline at end of file diff --git a/alternatives/REASSIGN_OWNED.7.gz b/alternatives/REASSIGN_OWNED.7.gz index 616135a..7b33bd8 120000 --- a/alternatives/REASSIGN_OWNED.7.gz +++ b/alternatives/REASSIGN_OWNED.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/REASSIGN_OWNED.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/REASSIGN_OWNED.7.gz \ No newline at end of file diff --git a/alternatives/REFRESH_MATERIALIZED_VIEW.7.gz b/alternatives/REFRESH_MATERIALIZED_VIEW.7.gz index d2367dc..5c111ed 120000 --- a/alternatives/REFRESH_MATERIALIZED_VIEW.7.gz +++ b/alternatives/REFRESH_MATERIALIZED_VIEW.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/REFRESH_MATERIALIZED_VIEW.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/REFRESH_MATERIALIZED_VIEW.7.gz \ No newline at end of file diff --git a/alternatives/REINDEX.7.gz b/alternatives/REINDEX.7.gz index e425f45..5bdc2fe 120000 --- a/alternatives/REINDEX.7.gz +++ b/alternatives/REINDEX.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/REINDEX.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/REINDEX.7.gz \ No newline at end of file diff --git a/alternatives/RELEASE_SAVEPOINT.7.gz b/alternatives/RELEASE_SAVEPOINT.7.gz index 60fdd22..374d6cc 120000 --- a/alternatives/RELEASE_SAVEPOINT.7.gz +++ b/alternatives/RELEASE_SAVEPOINT.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/RELEASE_SAVEPOINT.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/RELEASE_SAVEPOINT.7.gz \ No newline at end of file diff --git a/alternatives/RESET.7.gz b/alternatives/RESET.7.gz index 7cdee42..3199c48 120000 --- a/alternatives/RESET.7.gz +++ b/alternatives/RESET.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/RESET.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/RESET.7.gz \ No newline at end of file diff --git a/alternatives/REVOKE.7.gz b/alternatives/REVOKE.7.gz index 7e35530..2e7c5ff 120000 --- a/alternatives/REVOKE.7.gz +++ b/alternatives/REVOKE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/REVOKE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/REVOKE.7.gz \ No newline at end of file diff --git a/alternatives/ROLLBACK.7.gz b/alternatives/ROLLBACK.7.gz index 9a35f1d..f5da9a6 120000 --- a/alternatives/ROLLBACK.7.gz +++ b/alternatives/ROLLBACK.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ROLLBACK.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ROLLBACK.7.gz \ No newline at end of file diff --git a/alternatives/ROLLBACK_PREPARED.7.gz b/alternatives/ROLLBACK_PREPARED.7.gz index d113237..5e03796 120000 --- a/alternatives/ROLLBACK_PREPARED.7.gz +++ b/alternatives/ROLLBACK_PREPARED.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ROLLBACK_PREPARED.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ROLLBACK_PREPARED.7.gz \ No newline at end of file diff --git a/alternatives/ROLLBACK_TO_SAVEPOINT.7.gz b/alternatives/ROLLBACK_TO_SAVEPOINT.7.gz index 31539d9..1abcd54 120000 --- a/alternatives/ROLLBACK_TO_SAVEPOINT.7.gz +++ b/alternatives/ROLLBACK_TO_SAVEPOINT.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/ROLLBACK_TO_SAVEPOINT.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/ROLLBACK_TO_SAVEPOINT.7.gz \ No newline at end of file diff --git a/alternatives/SAVEPOINT.7.gz b/alternatives/SAVEPOINT.7.gz index 3e1e5b4..c9c333b 120000 --- a/alternatives/SAVEPOINT.7.gz +++ b/alternatives/SAVEPOINT.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/SAVEPOINT.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/SAVEPOINT.7.gz \ No newline at end of file diff --git a/alternatives/SECURITY_LABEL.7.gz b/alternatives/SECURITY_LABEL.7.gz index 80d63ac..7ffcc8c 120000 --- a/alternatives/SECURITY_LABEL.7.gz +++ b/alternatives/SECURITY_LABEL.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/SECURITY_LABEL.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/SECURITY_LABEL.7.gz \ No newline at end of file diff --git a/alternatives/SELECT.7.gz b/alternatives/SELECT.7.gz index 186532b..d27678f 120000 --- a/alternatives/SELECT.7.gz +++ b/alternatives/SELECT.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/SELECT.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/SELECT.7.gz \ No newline at end of file diff --git a/alternatives/SELECT_INTO.7.gz b/alternatives/SELECT_INTO.7.gz index 3105921..8a90be2 120000 --- a/alternatives/SELECT_INTO.7.gz +++ b/alternatives/SELECT_INTO.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/SELECT_INTO.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/SELECT_INTO.7.gz \ No newline at end of file diff --git a/alternatives/SET.7.gz b/alternatives/SET.7.gz index 7350f96..f4812e6 120000 --- a/alternatives/SET.7.gz +++ b/alternatives/SET.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/SET.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/SET.7.gz \ No newline at end of file diff --git a/alternatives/SET_CONSTRAINTS.7.gz b/alternatives/SET_CONSTRAINTS.7.gz index 1573e0f..e626426 120000 --- a/alternatives/SET_CONSTRAINTS.7.gz +++ b/alternatives/SET_CONSTRAINTS.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/SET_CONSTRAINTS.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/SET_CONSTRAINTS.7.gz \ No newline at end of file diff --git a/alternatives/SET_ROLE.7.gz b/alternatives/SET_ROLE.7.gz index df150c0..837c7c7 120000 --- a/alternatives/SET_ROLE.7.gz +++ b/alternatives/SET_ROLE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/SET_ROLE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/SET_ROLE.7.gz \ No newline at end of file diff --git a/alternatives/SET_SESSION_AUTHORIZATION.7.gz b/alternatives/SET_SESSION_AUTHORIZATION.7.gz index 49fa369..85b2ac2 120000 --- a/alternatives/SET_SESSION_AUTHORIZATION.7.gz +++ b/alternatives/SET_SESSION_AUTHORIZATION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/SET_SESSION_AUTHORIZATION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/SET_SESSION_AUTHORIZATION.7.gz \ No newline at end of file diff --git a/alternatives/SET_TRANSACTION.7.gz b/alternatives/SET_TRANSACTION.7.gz index 5a80397..2edc1af 120000 --- a/alternatives/SET_TRANSACTION.7.gz +++ b/alternatives/SET_TRANSACTION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/SET_TRANSACTION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/SET_TRANSACTION.7.gz \ No newline at end of file diff --git a/alternatives/SHOW.7.gz b/alternatives/SHOW.7.gz index 944ec32..6339c3d 120000 --- a/alternatives/SHOW.7.gz +++ b/alternatives/SHOW.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/SHOW.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/SHOW.7.gz \ No newline at end of file diff --git a/alternatives/START_TRANSACTION.7.gz b/alternatives/START_TRANSACTION.7.gz index 3cf766b..a30fc58 120000 --- a/alternatives/START_TRANSACTION.7.gz +++ b/alternatives/START_TRANSACTION.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/START_TRANSACTION.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/START_TRANSACTION.7.gz \ No newline at end of file diff --git a/alternatives/TABLE.7.gz b/alternatives/TABLE.7.gz index 8739707..09ca288 120000 --- a/alternatives/TABLE.7.gz +++ b/alternatives/TABLE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/TABLE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/TABLE.7.gz \ No newline at end of file diff --git a/alternatives/TRUNCATE.7.gz b/alternatives/TRUNCATE.7.gz index 0e3d187..a89b7e4 120000 --- a/alternatives/TRUNCATE.7.gz +++ b/alternatives/TRUNCATE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/TRUNCATE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/TRUNCATE.7.gz \ No newline at end of file diff --git a/alternatives/UNLISTEN.7.gz b/alternatives/UNLISTEN.7.gz index 3f9e7d6..f912afd 120000 --- a/alternatives/UNLISTEN.7.gz +++ b/alternatives/UNLISTEN.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/UNLISTEN.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/UNLISTEN.7.gz \ No newline at end of file diff --git a/alternatives/UPDATE.7.gz b/alternatives/UPDATE.7.gz index b4feb4f..b09c505 120000 --- a/alternatives/UPDATE.7.gz +++ b/alternatives/UPDATE.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/UPDATE.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/UPDATE.7.gz \ No newline at end of file diff --git a/alternatives/VACUUM.7.gz b/alternatives/VACUUM.7.gz index 8cef3e6..459728e 120000 --- a/alternatives/VACUUM.7.gz +++ b/alternatives/VACUUM.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/VACUUM.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/VACUUM.7.gz \ No newline at end of file diff --git a/alternatives/VALUES.7.gz b/alternatives/VALUES.7.gz index af8ddb2..932be32 120000 --- a/alternatives/VALUES.7.gz +++ b/alternatives/VALUES.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/VALUES.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/VALUES.7.gz \ No newline at end of file diff --git a/alternatives/WITH.7.gz b/alternatives/WITH.7.gz index 1fec360..2e75b2b 120000 --- a/alternatives/WITH.7.gz +++ b/alternatives/WITH.7.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man7/WITH.7.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man7/WITH.7.gz \ No newline at end of file diff --git a/alternatives/clusterdb.1.gz b/alternatives/clusterdb.1.gz index c39b8a2..aa3afd8 120000 --- a/alternatives/clusterdb.1.gz +++ b/alternatives/clusterdb.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/clusterdb.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/clusterdb.1.gz \ No newline at end of file diff --git a/alternatives/createdb.1.gz b/alternatives/createdb.1.gz index 1393e6d..2eadc6d 120000 --- a/alternatives/createdb.1.gz +++ b/alternatives/createdb.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/createdb.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/createdb.1.gz \ No newline at end of file diff --git a/alternatives/createlang.1.gz b/alternatives/createlang.1.gz index b51a007..ffe0920 120000 --- a/alternatives/createlang.1.gz +++ b/alternatives/createlang.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/createlang.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/createlang.1.gz \ No newline at end of file diff --git a/alternatives/createuser.1.gz b/alternatives/createuser.1.gz index 1713eab..2574bc3 120000 --- a/alternatives/createuser.1.gz +++ b/alternatives/createuser.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/createuser.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/createuser.1.gz \ No newline at end of file diff --git a/alternatives/dropdb.1.gz b/alternatives/dropdb.1.gz index c6a24f3..4be6862 120000 --- a/alternatives/dropdb.1.gz +++ b/alternatives/dropdb.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/dropdb.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/dropdb.1.gz \ No newline at end of file diff --git a/alternatives/droplang.1.gz b/alternatives/droplang.1.gz index 7545efb..db78d47 120000 --- a/alternatives/droplang.1.gz +++ b/alternatives/droplang.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/droplang.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/droplang.1.gz \ No newline at end of file diff --git a/alternatives/dropuser.1.gz b/alternatives/dropuser.1.gz index 36a6c92..756d20e 120000 --- a/alternatives/dropuser.1.gz +++ b/alternatives/dropuser.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/dropuser.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/dropuser.1.gz \ No newline at end of file diff --git a/alternatives/initdb.1.gz b/alternatives/initdb.1.gz index 7b314fe..b5b830b 120000 --- a/alternatives/initdb.1.gz +++ b/alternatives/initdb.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/initdb.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/initdb.1.gz \ No newline at end of file diff --git a/alternatives/my.cnf b/alternatives/my.cnf new file mode 120000 index 0000000..c0fe3dd --- /dev/null +++ b/alternatives/my.cnf @@ -0,0 +1 @@ +/etc/mysql/mariadb.cnf \ No newline at end of file diff --git a/alternatives/netrc.5.gz b/alternatives/netrc.5.gz new file mode 120000 index 0000000..5702a2c --- /dev/null +++ b/alternatives/netrc.5.gz @@ -0,0 +1 @@ +/usr/share/man/man5/netkit-netrc.5.gz \ No newline at end of file diff --git a/alternatives/pftp b/alternatives/pftp new file mode 120000 index 0000000..f0ae93f --- /dev/null +++ b/alternatives/pftp @@ -0,0 +1 @@ +/usr/bin/netkit-ftp \ No newline at end of file diff --git a/alternatives/pftp.1.gz b/alternatives/pftp.1.gz new file mode 120000 index 0000000..5b3a00b --- /dev/null +++ b/alternatives/pftp.1.gz @@ -0,0 +1 @@ +/usr/share/man/man1/netkit-ftp.1.gz \ No newline at end of file diff --git a/alternatives/pg_basebackup.1.gz b/alternatives/pg_basebackup.1.gz index 49ae747..eeb4b50 120000 --- a/alternatives/pg_basebackup.1.gz +++ b/alternatives/pg_basebackup.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/pg_basebackup.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/pg_basebackup.1.gz \ No newline at end of file diff --git a/alternatives/pg_controldata.1.gz b/alternatives/pg_controldata.1.gz index ea71614..8f612ce 120000 --- a/alternatives/pg_controldata.1.gz +++ b/alternatives/pg_controldata.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/pg_controldata.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/pg_controldata.1.gz \ No newline at end of file diff --git a/alternatives/pg_ctl.1.gz b/alternatives/pg_ctl.1.gz index 0c033d0..5919e12 120000 --- a/alternatives/pg_ctl.1.gz +++ b/alternatives/pg_ctl.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/pg_ctl.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/pg_ctl.1.gz \ No newline at end of file diff --git a/alternatives/pg_dump.1.gz b/alternatives/pg_dump.1.gz index 75caa7a..0c25258 120000 --- a/alternatives/pg_dump.1.gz +++ b/alternatives/pg_dump.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/pg_dump.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/pg_dump.1.gz \ No newline at end of file diff --git a/alternatives/pg_dumpall.1.gz b/alternatives/pg_dumpall.1.gz index 79075f7..4fbca0b 120000 --- a/alternatives/pg_dumpall.1.gz +++ b/alternatives/pg_dumpall.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/pg_dumpall.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/pg_dumpall.1.gz \ No newline at end of file diff --git a/alternatives/pg_isready.1.gz b/alternatives/pg_isready.1.gz index 3529fa9..007436c 120000 --- a/alternatives/pg_isready.1.gz +++ b/alternatives/pg_isready.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/pg_isready.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/pg_isready.1.gz \ No newline at end of file diff --git a/alternatives/pg_receivexlog.1.gz b/alternatives/pg_receivexlog.1.gz index 361dc7f..b36a4a1 120000 --- a/alternatives/pg_receivexlog.1.gz +++ b/alternatives/pg_receivexlog.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/pg_receivexlog.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/pg_receivexlog.1.gz \ No newline at end of file diff --git a/alternatives/pg_recvlogical.1.gz b/alternatives/pg_recvlogical.1.gz index 7d0f474..e914ef5 120000 --- a/alternatives/pg_recvlogical.1.gz +++ b/alternatives/pg_recvlogical.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/pg_recvlogical.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/pg_recvlogical.1.gz \ No newline at end of file diff --git a/alternatives/pg_resetxlog.1.gz b/alternatives/pg_resetxlog.1.gz index 8c04308..e632295 120000 --- a/alternatives/pg_resetxlog.1.gz +++ b/alternatives/pg_resetxlog.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/pg_resetxlog.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/pg_resetxlog.1.gz \ No newline at end of file diff --git a/alternatives/pg_restore.1.gz b/alternatives/pg_restore.1.gz index 1f718ef..74f0090 120000 --- a/alternatives/pg_restore.1.gz +++ b/alternatives/pg_restore.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/pg_restore.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/pg_restore.1.gz \ No newline at end of file diff --git a/alternatives/pg_rewind.1.gz b/alternatives/pg_rewind.1.gz new file mode 120000 index 0000000..a434bd6 --- /dev/null +++ b/alternatives/pg_rewind.1.gz @@ -0,0 +1 @@ +/usr/share/postgresql/9.6/man/man1/pg_rewind.1.gz \ No newline at end of file diff --git a/alternatives/pg_upgrade.1.gz b/alternatives/pg_upgrade.1.gz index 157d612..6dfd4f4 120000 --- a/alternatives/pg_upgrade.1.gz +++ b/alternatives/pg_upgrade.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/pg_upgrade.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/pg_upgrade.1.gz \ No newline at end of file diff --git a/alternatives/pg_xlogdump.1.gz b/alternatives/pg_xlogdump.1.gz index 5881260..120c7d4 120000 --- a/alternatives/pg_xlogdump.1.gz +++ b/alternatives/pg_xlogdump.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/pg_xlogdump.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/pg_xlogdump.1.gz \ No newline at end of file diff --git a/alternatives/phar b/alternatives/phar index 238208c..b02bc5b 120000 --- a/alternatives/phar +++ b/alternatives/phar @@ -1 +1 @@ -/usr/bin/phar5 \ No newline at end of file +/usr/bin/phar7.0 \ No newline at end of file diff --git a/alternatives/phar.1.gz b/alternatives/phar.1.gz index 5cab2ce..b627d37 120000 --- a/alternatives/phar.1.gz +++ b/alternatives/phar.1.gz @@ -1 +1 @@ -/usr/share/man/man1/phar5.1.gz \ No newline at end of file +/usr/share/man/man1/phar7.0.1.gz \ No newline at end of file diff --git a/alternatives/phar.phar b/alternatives/phar.phar new file mode 120000 index 0000000..c6602a3 --- /dev/null +++ b/alternatives/phar.phar @@ -0,0 +1 @@ +/usr/bin/phar.phar7.0 \ No newline at end of file diff --git a/alternatives/phar.phar.1.gz b/alternatives/phar.phar.1.gz new file mode 120000 index 0000000..9163d0f --- /dev/null +++ b/alternatives/phar.phar.1.gz @@ -0,0 +1 @@ +/usr/share/man/man1/phar.phar7.0.1.gz \ No newline at end of file diff --git a/alternatives/php b/alternatives/php index 07db26c..d87548b 120000 --- a/alternatives/php +++ b/alternatives/php @@ -1 +1 @@ -/usr/bin/php5 \ No newline at end of file +/usr/bin/php7.0 \ No newline at end of file diff --git a/alternatives/php.1.gz b/alternatives/php.1.gz index 28ca7d1..8ef3a9a 120000 --- a/alternatives/php.1.gz +++ b/alternatives/php.1.gz @@ -1 +1 @@ -/usr/share/man/man1/php5.1.gz \ No newline at end of file +/usr/share/man/man1/php7.0.1.gz \ No newline at end of file diff --git a/alternatives/pinentry b/alternatives/pinentry new file mode 120000 index 0000000..01990a3 --- /dev/null +++ b/alternatives/pinentry @@ -0,0 +1 @@ +/usr/bin/pinentry-curses \ No newline at end of file diff --git a/alternatives/pinentry.1.gz b/alternatives/pinentry.1.gz new file mode 120000 index 0000000..8e9ab4f --- /dev/null +++ b/alternatives/pinentry.1.gz @@ -0,0 +1 @@ +/usr/share/man/man1/pinentry-curses.1.gz \ No newline at end of file diff --git a/alternatives/postgres.1.gz b/alternatives/postgres.1.gz index de6dade..5ce4aba 120000 --- a/alternatives/postgres.1.gz +++ b/alternatives/postgres.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/postgres.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/postgres.1.gz \ No newline at end of file diff --git a/alternatives/postmaster.1.gz b/alternatives/postmaster.1.gz index 2f229d6..88f7e6f 120000 --- a/alternatives/postmaster.1.gz +++ b/alternatives/postmaster.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/postmaster.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/postmaster.1.gz \ No newline at end of file diff --git a/alternatives/psql.1.gz b/alternatives/psql.1.gz index 6e88438..f00817f 120000 --- a/alternatives/psql.1.gz +++ b/alternatives/psql.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/psql.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/psql.1.gz \ No newline at end of file diff --git a/alternatives/reindexdb.1.gz b/alternatives/reindexdb.1.gz index a5bca3f..a0fd3de 120000 --- a/alternatives/reindexdb.1.gz +++ b/alternatives/reindexdb.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/reindexdb.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/reindexdb.1.gz \ No newline at end of file diff --git a/alternatives/rzsh b/alternatives/rzsh deleted file mode 120000 index 3b005e7..0000000 --- a/alternatives/rzsh +++ /dev/null @@ -1 +0,0 @@ -/bin/zsh5 \ No newline at end of file diff --git a/alternatives/rzsh.1.gz b/alternatives/rzsh.1.gz deleted file mode 120000 index 15dffb2..0000000 --- a/alternatives/rzsh.1.gz +++ /dev/null @@ -1 +0,0 @@ -/usr/share/man/man1/zsh.1.gz \ No newline at end of file diff --git a/alternatives/traceroute6 b/alternatives/traceroute6 index 7958fcf..7554b55 120000 --- a/alternatives/traceroute6 +++ b/alternatives/traceroute6 @@ -1 +1 @@ -/usr/bin/traceroute6.db \ No newline at end of file +/usr/bin/traceroute6.iputils \ No newline at end of file diff --git a/alternatives/traceroute6.1.gz b/alternatives/traceroute6.1.gz deleted file mode 120000 index 7977291..0000000 --- a/alternatives/traceroute6.1.gz +++ /dev/null @@ -1 +0,0 @@ -/usr/share/man/man1/traceroute6.db.1.gz \ No newline at end of file diff --git a/alternatives/traceroute6.8.gz b/alternatives/traceroute6.8.gz new file mode 120000 index 0000000..e69934c --- /dev/null +++ b/alternatives/traceroute6.8.gz @@ -0,0 +1 @@ +/usr/share/man/man8/traceroute6.iputils.8.gz \ No newline at end of file diff --git a/alternatives/updatedb.8.gz b/alternatives/updatedb.8.gz new file mode 120000 index 0000000..d48060b --- /dev/null +++ b/alternatives/updatedb.8.gz @@ -0,0 +1 @@ +/usr/share/man/man8/updatedb.mlocate.8.gz \ No newline at end of file diff --git a/alternatives/vacuumdb.1.gz b/alternatives/vacuumdb.1.gz index c0ea543..fb28552 120000 --- a/alternatives/vacuumdb.1.gz +++ b/alternatives/vacuumdb.1.gz @@ -1 +1 @@ -/usr/share/postgresql/9.4/man/man1/vacuumdb.1.gz \ No newline at end of file +/usr/share/postgresql/9.6/man/man1/vacuumdb.1.gz \ No newline at end of file diff --git a/alternatives/zsh b/alternatives/zsh deleted file mode 120000 index 3b005e7..0000000 --- a/alternatives/zsh +++ /dev/null @@ -1 +0,0 @@ -/bin/zsh5 \ No newline at end of file diff --git a/alternatives/zsh-usrbin b/alternatives/zsh-usrbin deleted file mode 120000 index 3b005e7..0000000 --- a/alternatives/zsh-usrbin +++ /dev/null @@ -1 +0,0 @@ -/bin/zsh5 \ No newline at end of file diff --git a/apache2/apache2.conf b/apache2/apache2.conf index baf6d8a..ae4b2c3 100644 --- a/apache2/apache2.conf +++ b/apache2/apache2.conf @@ -71,7 +71,13 @@ # # The accept serialization lock file MUST BE STORED ON A LOCAL DISK. # -Mutex file:${APACHE_LOCK_DIR} default +#Mutex file:${APACHE_LOCK_DIR} default + +# +# The directory where shm and other runtime files will be stored. +# + +DefaultRuntimeDir ${APACHE_RUN_DIR} # # PidFile: The file in which the server should record its process diff --git a/apache2/conf-available/security.conf b/apache2/conf-available/security.conf index 599333b..f9f69d4 100644 --- a/apache2/conf-available/security.conf +++ b/apache2/conf-available/security.conf @@ -7,8 +7,7 @@ # # # AllowOverride None -# Order Deny,Allow -# Deny from all +# Require all denied # diff --git a/apache2/envvars b/apache2/envvars index 91328ac..708d170 100644 --- a/apache2/envvars +++ b/apache2/envvars @@ -16,7 +16,7 @@ fi export APACHE_RUN_USER=www-data export APACHE_RUN_GROUP=www-data # temporary state file location. This might be changed to /run in Wheezy+1 -export APACHE_PID_FILE=/var/run/apache2/apache2$SUFFIX.pid +export APACHE_PID_FILE=/var/run/apache2$SUFFIX/apache2.pid export APACHE_RUN_DIR=/var/run/apache2$SUFFIX export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX # Only /var/log/apache2 is handled by /etc/logrotate.d/apache2. diff --git a/apache2/mods-available/cern_meta.load b/apache2/mods-available/cern_meta.load new file mode 100644 index 0000000..bcc7546 --- /dev/null +++ b/apache2/mods-available/cern_meta.load @@ -0,0 +1 @@ +LoadModule cern_meta_module /usr/lib/apache2/modules/mod_cern_meta.so diff --git a/apache2/mods-available/http2.load b/apache2/mods-available/http2.load new file mode 100644 index 0000000..e5c769f --- /dev/null +++ b/apache2/mods-available/http2.load @@ -0,0 +1 @@ +LoadModule http2_module /usr/lib/apache2/modules/mod_http2.so diff --git a/apache2/mods-available/imagemap.load b/apache2/mods-available/imagemap.load new file mode 100644 index 0000000..0fd55f8 --- /dev/null +++ b/apache2/mods-available/imagemap.load @@ -0,0 +1 @@ +LoadModule imagemap_module /usr/lib/apache2/modules/mod_imagemap.so diff --git a/apache2/mods-available/php7.0.conf b/apache2/mods-available/php7.0.conf new file mode 100644 index 0000000..41b48f9 --- /dev/null +++ b/apache2/mods-available/php7.0.conf @@ -0,0 +1,25 @@ + + SetHandler application/x-httpd-php + + + SetHandler application/x-httpd-php-source + # Deny access to raw php sources by default + # To re-enable it's recommended to enable access to the files + # only in specific virtual host or directory + Require all denied + +# Deny access to files without filename (e.g. '.php') + + Require all denied + + +# Running PHP scripts in user directories is disabled by default +# +# To re-enable PHP in user directories comment the following lines +# (from to .) Do NOT set it to On as it +# prevents .htaccess files from disabling it. + + + php_admin_flag engine Off + + diff --git a/apache2/mods-available/php7.0.load b/apache2/mods-available/php7.0.load new file mode 100644 index 0000000..b539a0e --- /dev/null +++ b/apache2/mods-available/php7.0.load @@ -0,0 +1,3 @@ +# Conflicts: php5 +# Depends: mpm_prefork +LoadModule php7_module /usr/lib/apache2/modules/libphp7.0.so diff --git a/apache2/mods-available/proxy_hcheck.load b/apache2/mods-available/proxy_hcheck.load new file mode 100644 index 0000000..b70f421 --- /dev/null +++ b/apache2/mods-available/proxy_hcheck.load @@ -0,0 +1,2 @@ +# Depends: proxy +LoadModule proxy_hcheck_module /usr/lib/apache2/modules/mod_proxy_hcheck.so diff --git a/apache2/mods-available/proxy_html.load b/apache2/mods-available/proxy_html.load index d8b248e..50f1a2c 100644 --- a/apache2/mods-available/proxy_html.load +++ b/apache2/mods-available/proxy_html.load @@ -1,2 +1,2 @@ -# Depends: proxy +# Depends: proxy xml2enc LoadModule proxy_html_module /usr/lib/apache2/modules/mod_proxy_html.so diff --git a/apache2/mods-available/proxy_http2.load b/apache2/mods-available/proxy_http2.load new file mode 100644 index 0000000..b251d0c --- /dev/null +++ b/apache2/mods-available/proxy_http2.load @@ -0,0 +1,2 @@ +# Depends: proxy http2 +LoadModule proxy_http2_module /usr/lib/apache2/modules/mod_proxy_http2.so diff --git a/apache2/mods-available/userdir.conf b/apache2/mods-available/userdir.conf index a6c0da6..2c334ec 100644 --- a/apache2/mods-available/userdir.conf +++ b/apache2/mods-available/userdir.conf @@ -5,12 +5,7 @@ AllowOverride FileInfo AuthConfig Limit Indexes Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec - - Require all granted - - - Require all denied - + Require method GET POST OPTIONS diff --git a/apm/event.d/01chrony b/apm/event.d/01chrony deleted file mode 100755 index df52908..0000000 --- a/apm/event.d/01chrony +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# Placed in /etc/apm/event.d by the chrony package at the instruction of -# the apmd maintainer. If you don't have apm and don't intend to install -# apmd you may remove it. It needs to run after 00hwclock but before any -# other scripts. - - -[ -x /usr/sbin/chronyd ] || exit 0 - -if [ "$1" = suspend ]; then - invoke-rc.d chrony stop -elif [ "$1" = standby ]; then - invoke-rc.d chrony stop -elif [ "$1" = resume ]; then - invoke-rc.d chrony start -fi diff --git a/apparmor.d/local/usr.sbin.haveged b/apparmor.d/local/usr.sbin.haveged new file mode 100644 index 0000000..07c2960 --- /dev/null +++ b/apparmor.d/local/usr.sbin.haveged @@ -0,0 +1,2 @@ +# Site-specific additions and overrides for usr.sbin.haveged. +# For more details, please see /etc/apparmor.d/local/README. diff --git a/apparmor.d/usr.sbin.haveged b/apparmor.d/usr.sbin.haveged new file mode 100644 index 0000000..0e61138 --- /dev/null +++ b/apparmor.d/usr.sbin.haveged @@ -0,0 +1,23 @@ +# Last Modified: Fri Aug 21 15:23:17 2015 +#include + +/usr/sbin/haveged { + #include + + # Required for ioctl RNDADDENTROPY + capability sys_admin, + + owner @{PROC}/@{pid}/status r, + + @{PROC}/sys/kernel/osrelease r, + @{PROC}/sys/kernel/random/poolsize r, + @{PROC}/sys/kernel/random/write_wakeup_threshold w, + /dev/random w, + + /sys/devices/system/cpu/ r, + /sys/devices/system/cpu/cpu*/cache/ r, + /sys/devices/system/cpu/cpu*/cache/index*/{type,size,level} r, + /usr/sbin/haveged mr, + + #include +} diff --git a/apparmor.d/usr.sbin.named b/apparmor.d/usr.sbin.named index 35df558..43e27c0 100644 --- a/apparmor.d/usr.sbin.named +++ b/apparmor.d/usr.sbin.named @@ -35,8 +35,9 @@ # dnscvsutil package /var/lib/dnscvsutil/compiled/** rw, - /proc/net/if_inet6 r, - /proc/*/net/if_inet6 r, + @{PROC}/net/if_inet6 r, + @{PROC}/*/net/if_inet6 r, + @{PROC}/sys/net/ipv4/ip_local_port_range r, /usr/sbin/named mr, /{,var/}run/named/named.pid w, /{,var/}run/named/session.key w, @@ -48,6 +49,19 @@ /var/log/named/** rw, /var/log/named/ rw, + # gssapi + /var/lib/sss/pubconf/krb5.include.d/** r, + /var/lib/sss/pubconf/krb5.include.d/ r, + /var/lib/sss/mc/initgroups r, + /etc/gss/mech.d/ r, + + # ldap + /etc/ldap/ldap.conf r, + /{,var/}run/slapd-*.socket rw, + + # dynamic updates + /var/tmp/DNS_* rw, + # Site-specific additions and overrides. See local/README for details. #include } diff --git a/apt/apt.conf.d/01autoremove b/apt/apt.conf.d/01autoremove index fc02350..3609ca4 100644 --- a/apt/apt.conf.d/01autoremove +++ b/apt/apt.conf.d/01autoremove @@ -29,10 +29,18 @@ APT Never-MarkAuto-Sections { "metapackages"; + "contrib/metapackages"; + "non-free/metapackages"; "restricted/metapackages"; "universe/metapackages"; "multiverse/metapackages"; + }; + + Move-Autobit-Sections + { "oldlibs"; + "contrib/oldlibs"; + "non-free/oldlibs"; "restricted/oldlibs"; "universe/oldlibs"; "multiverse/oldlibs"; diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index 7afb97f..90ff308 100644 --- a/apt/apt.conf.d/01autoremove-kernels +++ b/apt/apt.conf.d/01autoremove-kernels @@ -3,24 +3,66 @@ APT::NeverAutoRemove { "^linux-image-4\.9\.0-0\.bpo\.2-amd64$"; "^linux-image-4\.9\.0-0\.bpo\.3-amd64$"; + "^linux-image-4\.9\.0-3-amd64$"; "^linux-headers-4\.9\.0-0\.bpo\.2-amd64$"; "^linux-headers-4\.9\.0-0\.bpo\.3-amd64$"; + "^linux-headers-4\.9\.0-3-amd64$"; "^linux-image-extra-4\.9\.0-0\.bpo\.2-amd64$"; "^linux-image-extra-4\.9\.0-0\.bpo\.3-amd64$"; + "^linux-image-extra-4\.9\.0-3-amd64$"; "^linux-signed-image-4\.9\.0-0\.bpo\.2-amd64$"; "^linux-signed-image-4\.9\.0-0\.bpo\.3-amd64$"; + "^linux-signed-image-4\.9\.0-3-amd64$"; "^kfreebsd-image-4\.9\.0-0\.bpo\.2-amd64$"; "^kfreebsd-image-4\.9\.0-0\.bpo\.3-amd64$"; + "^kfreebsd-image-4\.9\.0-3-amd64$"; "^kfreebsd-headers-4\.9\.0-0\.bpo\.2-amd64$"; "^kfreebsd-headers-4\.9\.0-0\.bpo\.3-amd64$"; + "^kfreebsd-headers-4\.9\.0-3-amd64$"; "^gnumach-image-4\.9\.0-0\.bpo\.2-amd64$"; "^gnumach-image-4\.9\.0-0\.bpo\.3-amd64$"; + "^gnumach-image-4\.9\.0-3-amd64$"; "^.*-modules-4\.9\.0-0\.bpo\.2-amd64$"; "^.*-modules-4\.9\.0-0\.bpo\.3-amd64$"; + "^.*-modules-4\.9\.0-3-amd64$"; "^.*-kernel-4\.9\.0-0\.bpo\.2-amd64$"; "^.*-kernel-4\.9\.0-0\.bpo\.3-amd64$"; + "^.*-kernel-4\.9\.0-3-amd64$"; "^linux-backports-modules-.*-4\.9\.0-0\.bpo\.2-amd64$"; "^linux-backports-modules-.*-4\.9\.0-0\.bpo\.3-amd64$"; + "^linux-backports-modules-.*-4\.9\.0-3-amd64$"; "^linux-tools-4\.9\.0-0\.bpo\.2-amd64$"; "^linux-tools-4\.9\.0-0\.bpo\.3-amd64$"; + "^linux-tools-4\.9\.0-3-amd64$"; }; +/* Debug information: +# dpkg list: +rc linux-image-3.16.0-4-amd64 3.16.7-ckt25-2 amd64 Linux 3.16 for 64-bit PCs +rc linux-image-4.7.0-0.bpo.1-amd64 4.7.8-1~bpo8+1 amd64 Linux 4.7 for 64-bit PCs (signed) +rc linux-image-4.8.0-0.bpo.2-amd64 4.8.15-2~bpo8+2 amd64 Linux 4.8 for 64-bit PCs (signed) +rc linux-image-4.9.0-0.bpo.1-amd64 4.9.2-2~bpo8+1 amd64 Linux 4.9 for 64-bit PCs (signed) +ii linux-image-4.9.0-0.bpo.2-amd64 4.9.18-1~bpo8+1 amd64 Linux 4.9 for 64-bit PCs (signed) +ii linux-image-4.9.0-0.bpo.3-amd64 4.9.30-2+deb9u2~bpo8+1 amd64 Linux 4.9 for 64-bit PCs +iF linux-image-4.9.0-3-amd64 4.9.30-2+deb9u2 amd64 Linux 4.9 for 64-bit PCs +iU linux-image-amd64 4.9+80 amd64 Linux for 64-bit PCs (meta-package) +# list of installed kernel packages: +4.9.0-0.bpo.2-amd64 4.9.18-1~bpo8+1 +4.9.0-0.bpo.3-amd64 4.9.30-2+deb9u2~bpo8+1 +4.9.0-3-amd64 4.9.30-2+deb9u2 +# list of different kernel versions: +4.9.30-2+deb9u2 +4.9.30-2+deb9u2~bpo8+1 +4.9.18-1~bpo8+1 +# Installing kernel: 4.9.30-2+deb9u2 (4.9.0-3-amd64) +# Running kernel: 4.9.18-1~bpo8+1 (4.9.0-0.bpo.2-amd64) +# Last kernel: 4.9.30-2+deb9u2 +# Previous kernel: 4.9.30-2+deb9u2~bpo8+1 +# Kernel versions list to keep: +4.9.18-1~bpo8+1 +4.9.30-2+deb9u2 +4.9.30-2+deb9u2~bpo8+1 +# Kernel packages (version part) to protect: +4\.9\.0-0\.bpo\.2-amd64 +4\.9\.0-0\.bpo\.3-amd64 +4\.9\.0-3-amd64 +*/ diff --git a/bash_completion.d/apache2 b/bash_completion.d/apache2 deleted file mode 100644 index e57c100..0000000 --- a/bash_completion.d/apache2 +++ /dev/null @@ -1,89 +0,0 @@ -# bash completion for Debian apache2 configuration tools - -_apache2_allcomp() -{ - command ls /etc/apache2/$1 2>/dev/null -} - -_apache2_mods() -{ - COMPREPLY=( $( compgen -W '$( _apache2_allcomp $1 \ - | sed -e 's/[.]load$//' -e 's/[.]conf$//' )' -- $cur ) ) -} - -_apache2_sites() -{ - COMPREPLY=( $( compgen -W '$( _apache2_allcomp $1 )' -- $cur ) ) -} - -_apache2_conf() -{ - COMPREPLY=( $( compgen -W '$( _apache2_allcomp $1 \ - | sed -e 's/[.]conf$//' )' -- $cur ) ) -} - -_a2enmod() -{ - local cur - - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - - _apache2_mods mods-available -} -complete -F _a2enmod a2enmod - -_a2ensite() -{ - local cur - - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - - _apache2_sites sites-available -} -complete -F _a2ensite a2ensite - -_a2enconf() -{ - local cur - - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - - _apache2_conf conf-available -} -complete -F _a2enconf a2enconf - -_a2dismod() -{ - local cur - - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - - _apache2_mods mods-enabled -} -complete -F _a2dismod a2dismod - -_a2dissite() -{ - local cur - - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - - _apache2_sites sites-enabled -} -complete -F _a2dissite a2dissite - -_a2disconf() -{ - local cur - - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - - _apache2_conf conf-enabled -} -complete -F _a2disconf a2disconf diff --git a/bash_completion.d/debconf b/bash_completion.d/debconf deleted file mode 100644 index 1880689..0000000 --- a/bash_completion.d/debconf +++ /dev/null @@ -1,12 +0,0 @@ -have debconf-show && -_debconf_show() -{ - local cur - - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - COMPREPLY=($( compgen -W '--listowners --listdbs --db=' -- $cur ) \ - $( apt-cache pkgnames -- $cur ) ) -} -complete -F _debconf_show debconf-show - diff --git a/bash_completion.d/etckeeper b/bash_completion.d/etckeeper deleted file mode 100644 index b1a3d31..0000000 --- a/bash_completion.d/etckeeper +++ /dev/null @@ -1,8 +0,0 @@ -_etckeeper() { - local cur; - COMPREPLY=(); - cur=${COMP_WORDS[COMP_CWORD]}; - COMPREPLY=( $( compgen -W '$(cd /etc/etckeeper/; for i in *.d/; do echo ${i%.d/}; done)' -- $cur ) ); -} - -complete -F _etckeeper etckeeper diff --git a/bash_completion.d/fail2ban b/bash_completion.d/fail2ban index 7a42bd1..36e0cbb 100644 --- a/bash_completion.d/fail2ban +++ b/bash_completion.d/fail2ban @@ -19,10 +19,19 @@ __fail2ban_jails () { "$1" status 2>/dev/null | awk -F"\t+" '/Jail list/{print $2}' | sed 's/, / /g' } +__fail2ban_jail_actions () { + "$1" get "$2" actions 2>/dev/null | sed -n '$s/\([^,]\+\),\?/\1/gp' +} +__fail2ban_jail_action_properties () { + "$1" get "$2" actionproperties "$3" 2>/dev/null | sed -n '$s/\([^,]\+\),\?/\1/gp' +} +__fail2ban_jail_action_methods () { + "$1" get "$2" actionmethods "$3" 2>/dev/null | sed -n '$s/\([^,]\+\),\?/\1/gp' +} _fail2ban () { local cur prev words cword - _init_completion || return + _init_completion || return case $prev in -V|--version|-h|--help) @@ -50,7 +59,7 @@ _fail2ban () { _filedir return 0 elif [[ "$1" == *"fail2ban-client" ]];then - local cmd jail + local cmd jail action case $prev in "$1") COMPREPLY=( $( compgen -W \ @@ -71,7 +80,7 @@ _fail2ban () { ;; *) if [[ "${words[$cword-2]}" == "add" ]];then - COMPREPLY=( $( compgen -W "auto polling gamin pyinotify" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "auto polling gamin pyinotify systemd" -- "$cur" ) ) return 0 elif [[ "${words[$cword-2]}" == "set" || "${words[$cword-2]}" == "get" ]];then cmd="${words[cword-2]}" @@ -80,6 +89,11 @@ _fail2ban () { cmd="${words[$cword-3]}" jail="${words[$cword-2]}" # Handle in section below + elif [[ "${words[$cword-4]}" == "set" || "${words[$cword-4]}" == "get" && ${words[$cword-2]} == action* ]];then + cmd="${words[$cword-4]}" + jail="${words[$cword-3]}" + action="${words[$cword-1]}" + # Handle in section below fi ;; esac @@ -88,7 +102,7 @@ _fail2ban () { case $prev in loglevel) if [[ "$cmd" == "set" ]];then - COMPREPLY=( $( compgen -W "0 1 2 3 4" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "CRITICAL ERROR WARNING NOTICE INFO DEBUG" -- "$cur" ) ) fi return 0 ;; @@ -106,6 +120,25 @@ _fail2ban () { return 0 ;; esac + elif [[ -n "$jail" && -n "$action" ]];then + case ${words[$cwords-3]} in + action) + COMPREPLY=( $( compgen -W \ + "$( __fail2ban_jail_action_properties "$1" "$jail" "$action")" \ + -- "$cur" ) ) + if [[ "$cmd" == "set" ]];then + COMPREPLY+=( $(compgen -W "$(__fail2ban_jail_action_methods "$1" "$jail" "$action")" -- "$cur" ) ) + fi + return 0 + ;; + esac + elif [[ -n "$jail" && $prev == action* ]];then + case $prev in + action|actionproperties|actionmethods) + COMPREPLY=( $(compgen -W "$(__fail2ban_jail_actions "$1" "$jail")" -- "$cur" ) ) + return 0 + ;; + esac elif [[ -n "$jail" && "$cmd" == "set" ]];then case $prev in addlogpath) @@ -121,7 +154,7 @@ _fail2ban () { fi return 0 ;; - delfailregex|delignoregex) + delfailregex|delignoreregex) COMPREPLY=( $( compgen -W \ "$( "$1" get "$jail" "${prev/del/}" 2>/dev/null | awk -F"[][]" '{print $2}')" \ -- "$cur" ) ) diff --git a/bash_completion.d/initramfs-tools b/bash_completion.d/initramfs-tools deleted file mode 100644 index a52074f..0000000 --- a/bash_completion.d/initramfs-tools +++ /dev/null @@ -1,26 +0,0 @@ -# update-initramfs(8) completion - -_update_initramfs() -{ - local cur prev valid_options - - # TODO: this can be "_get_comp_words_by_ref cur prev" once - # bash-completion >= 1.2 is available, see #537139 - cur=$(_get_cword) - prev=${COMP_WORDS[COMP_CWORD-1]} - - # The only option that takes an argument is -k - if [[ "$prev" == '-k' ]]; then - # Complete with kernel versions - _kernel_versions - COMPREPLY=( $( compgen -W '${COMPREPLY[@]} all' -- "$cur" ) ) - return; - fi - - # Complete with available options (obtained from -h) - valid_options=$( update-initramfs -h 2>&1 | \ - sed -e '/^ -/!d;s/^ \(-\w\+\).*/\1/' ) - COMPREPLY=( $( compgen -W "$valid_options" -- $cur ) ) -} - -complete -F _update_initramfs update-initramfs diff --git a/bash_completion.d/isoquery b/bash_completion.d/isoquery deleted file mode 100644 index c27ed05..0000000 --- a/bash_completion.d/isoquery +++ /dev/null @@ -1,45 +0,0 @@ -# /etc/bash_completion.d/isoquery -# Programmable Bash command completion for the ‘isoquery’ command. - -shopt -s progcomp - -_isoquery_completion () { - local cur prev opts - - COMPREPLY=() - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" - - opts="-h --help -v --version" - opts="${opts} -i --iso -x --xmlfile -l --locale -0 --null" - opts="${opts} -n --name -o --official_name -c --common_name" - - case "${prev}" in - -i|--iso) - local standards=(639 639-3 639-5 3166 3166-2 4217 15924) - COMPREPLY=( $(compgen -W "${standards[*]}" -- ${cur}) ) - ;; - - -x|--xmlfile) - COMPREPLY=( $(compgen -A file -- ${cur}) ) - ;; - - -l|--locale) - local locale_names=$(locale --all-locales) - COMPREPLY=( $(compgen -W "${locale_names}" -- ${cur}) ) - ;; - - *) - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) - ;; - esac -} - -complete -F _isoquery_completion isoquery - - -# Local variables: -# coding: utf-8 -# mode: shell-script -# End: -# vim: fileencoding=utf-8 filetype=bash : diff --git a/bash_completion.d/whiptail b/bash_completion.d/whiptail deleted file mode 100644 index 6826e56..0000000 --- a/bash_completion.d/whiptail +++ /dev/null @@ -1,6 +0,0 @@ -complete -W "--msgbox --yesno --infobox --inputbox --passwordbox --textbox --menu --checklist \ - --radiochecklist --gauge --clear --defaultno --default-item \ - --fb --nocancel --yes-button --no-button --ok-button \ - --cancel-button -noitem --separate-output --output-fd \ - --title --backtitle -scrolltext --toplefti \ - --help" -f whiptail diff --git a/bind/db.root b/bind/db.root index 6c19741..f0b79d2 100644 --- a/bind/db.root +++ b/bind/db.root @@ -9,30 +9,32 @@ ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Jan 3, 2013 -; related version of root zone: 2013010300 +; last update: February 17, 2016 +; related version of root zone: 2016021701 ; ; formerly NS.INTERNIC.NET ; -. 3600000 IN NS A.ROOT-SERVERS.NET. +. 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 -A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:BA3E::2:30 +A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 ; ; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 +B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:84::b ; ; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 +C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c ; ; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 -D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2D::D +D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d ; ; FORMERLY NS.NASA.GOV ; @@ -43,7 +45,7 @@ E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 -F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2F::F +F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f ; ; FORMERLY NS.NIC.DDN.MIL ; @@ -53,26 +55,26 @@ G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. -H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53 -H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803F:235 +H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 +H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 ; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 -I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53 +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 ; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 -J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:C27::2:30 +J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 ; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 -K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FD::1 +K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 ; ; OPERATED BY ICANN ; @@ -84,5 +86,5 @@ L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42 ; . 3600000 NS M.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 -M.ROOT-SERVERS.NET. 3600000 AAAA 2001:DC3::35 -; End of File +M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 +; End of file diff --git a/ca-certificates.conf b/ca-certificates.conf index 657c928..374fe97 100644 --- a/ca-certificates.conf +++ b/ca-certificates.conf @@ -33,8 +33,8 @@ mozilla/CA_Disig_Root_R1.crt mozilla/CA_Disig_Root_R2.crt mozilla/Camerfirma_Chambers_of_Commerce_Root.crt mozilla/Camerfirma_Global_Chambersign_Root.crt -mozilla/CA_WoSign_ECC_Root.crt -mozilla/Certification_Authority_of_WoSign_G2.crt +!mozilla/CA_WoSign_ECC_Root.crt +!mozilla/Certification_Authority_of_WoSign_G2.crt mozilla/Certigna.crt mozilla/Certinomis_-_Autorité_Racine.crt mozilla/Certinomis_-_Root_CA.crt @@ -135,9 +135,9 @@ mozilla/Staat_der_Nederlanden_Root_CA_-_G3.crt mozilla/Starfield_Class_2_CA.crt mozilla/Starfield_Root_Certificate_Authority_-_G2.crt mozilla/Starfield_Services_Root_Certificate_Authority_-_G2.crt -mozilla/StartCom_Certification_Authority_2.crt -mozilla/StartCom_Certification_Authority.crt -mozilla/StartCom_Certification_Authority_G2.crt +!mozilla/StartCom_Certification_Authority_2.crt +!mozilla/StartCom_Certification_Authority.crt +!mozilla/StartCom_Certification_Authority_G2.crt mozilla/S-TRUST_Authentication_and_Encryption_Root_CA_2005_PN.crt mozilla/S-TRUST_Universal_Root_CA.crt mozilla/Swisscom_Root_CA_1.crt @@ -179,10 +179,10 @@ mozilla/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.crt mozilla/VeriSign_Universal_Root_Certification_Authority.crt mozilla/Visa_eCommerce_Root.crt mozilla/WellsSecure_Public_Root_Certificate_Authority.crt -mozilla/WoSign_China.crt -mozilla/WoSign.crt +!mozilla/WoSign_China.crt +!mozilla/WoSign.crt mozilla/XRamp_Global_CA_Root.crt -spi-inc.org/spi-cacert-2008.crt +!spi-inc.org/spi-cacert-2008.crt mozilla/Certplus_Root_CA_G1.crt mozilla/Certplus_Root_CA_G2.crt mozilla/Certum_Trusted_Network_CA_2.crt diff --git a/chrony/chrony.keys b/chrony/chrony.keys index ffbc4b1..cee70b3 100644 --- a/chrony/chrony.keys +++ b/chrony/chrony.keys @@ -1 +1,10 @@ -1 MGQe7DjC +# This file is solely used for NTP authentication with symmetric keys +# as defined by RFC 1305 and RFC 5905. +# +# It can contain ID/key pairs which can be generated using the “keygen” option +# from “chronyc”; for example: +# chronyc keygen 1 SHA256 256 >> /etc/chrony/chrony.keys +# would generate a 256-bit SHA-256 key using ID 1. +# +# A list of supported hash functions and output encoding can be found in +# the "keyfile" section from the "/usr/share/doc/chrony/chrony.txt.gz" file. diff --git a/colordiffrc b/colordiffrc index 4bcb02d..1ac1a17 100644 --- a/colordiffrc +++ b/colordiffrc @@ -23,7 +23,7 @@ diff_cmd=diff # this, use the default output colour" # plain=off -newtext=blue -oldtext=red -diffstuff=magenta -cvsstuff=green +newtext=darkgreen +oldtext=darkred +diffstuff=darkcyan +cvsstuff=cyan diff --git a/console-setup/cached_UTF-8_del.kmap.gz b/console-setup/cached_UTF-8_del.kmap.gz index c32e901..477370a 100644 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_setup_font.sh b/console-setup/cached_setup_font.sh new file mode 100755 index 0000000..3939676 --- /dev/null +++ b/console-setup/cached_setup_font.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +setfont '/etc/console-setup/cached_Lat15-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/cached_Lat15-Fixed16.psf.gz' + } < /dev/tty${i#/dev/vcs} > /dev/tty${i#/dev/vcs} + done +fi + +mkdir -p /run/console-setup +> /run/console-setup/font-loaded +for i in /dev/vcs[0-9]*; do + { : +printf '\033%%G' + } < /dev/tty${i#/dev/vcs} > /dev/tty${i#/dev/vcs} +done diff --git a/console-setup/cached_setup_keyboard.sh b/console-setup/cached_setup_keyboard.sh new file mode 100755 index 0000000..88cb283 --- /dev/null +++ b/console-setup/cached_setup_keyboard.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ -f /run/console-setup/keymap_loaded ]; then + rm /run/console-setup/keymap_loaded + exit 0 +fi +kbd_mode '-u' < '/dev/tty1' +kbd_mode '-u' < '/dev/tty2' +kbd_mode '-u' < '/dev/tty3' +kbd_mode '-u' < '/dev/tty4' +kbd_mode '-u' < '/dev/tty5' +kbd_mode '-u' < '/dev/tty6' +loadkeys '/tmp/tmpkbd.r4FkOG' > '/dev/null' diff --git a/console-setup/cached_setup_terminal.sh b/console-setup/cached_setup_terminal.sh new file mode 100755 index 0000000..494e363 --- /dev/null +++ b/console-setup/cached_setup_terminal.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +{ : +printf '\033%%G' +} < /dev/tty${1#vcs} > /dev/tty${1#vcs} diff --git a/console-setup/compose.ISO-8859-1.inc b/console-setup/compose.ISO-8859-1.inc index c568ba8..a285ddf 100644 --- a/console-setup/compose.ISO-8859-1.inc +++ b/console-setup/compose.ISO-8859-1.inc @@ -56,13 +56,8 @@ compose '/' '^' to '|' compose '/' 'c' to '¢' compose '/' 'o' to 'ø' compose '/' 'u' to 'µ' -compose '0' 'c' to '©' -compose '0' 's' to '§' -compose '0' 'x' to '¤' compose '1' '2' to '½' compose '1' '4' to '¼' -compose '1' 's' to '¹' -compose '2' 's' to '²' compose '3' '4' to '¾' compose ':' '-' to '÷' compose '<' '/' to '\\' @@ -135,21 +130,21 @@ compose '`' 'u' to ' compose 'a' 'e' to 'æ' compose 'a' 'o' to 'å' compose 'a' 't' to '@' -compose 'b' 'v' to '¦' compose 'c' '0' to '©' compose 'c' 'o' to '©' -compose 'l' 'v' to '|' compose 'o' 'c' to '©' -compose 'o' 'r' to '®' -compose 'o' 's' to '§' compose 'o' 'x' to '¤' +compose 'r' 'o' to '®' compose 's' '0' to '§' +compose 's' '1' to '¹' compose 's' '2' to '²' compose 's' '3' to '³' compose 's' 'o' to '§' compose 't' 'h' to 'þ' compose 'v' 'b' to '¦' +compose 'v' 'l' to '|' compose 'x' '0' to '¤' +compose 'x' 'o' to '¤' compose '|' 'c' to '¢' compose '|' '|' to '¦' compose '~' 'A' to 'Ã' @@ -158,16 +153,3 @@ compose '~' 'O' to ' compose '~' 'a' to 'ã' compose '~' 'n' to 'ñ' compose '~' 'o' to 'õ' -compose '¨' 'A' to 'Ä' -compose '¨' 'E' to 'Ë' -compose '¨' 'I' to 'Ï' -compose '¨' 'O' to 'Ö' -compose '¨' 'U' to 'Ü' -compose '¨' 'a' to 'ä' -compose '¨' 'e' to 'ë' -compose '¨' 'i' to 'ï' -compose '¨' 'o' to 'ö' -compose '¨' 'u' to 'ü' -compose '¨' 'y' to 'ÿ' -compose '°' 'A' to 'Å' -compose '°' 'a' to 'å' diff --git a/console-setup/compose.ISO-8859-13.inc b/console-setup/compose.ISO-8859-13.inc index a867a9e..5b45a26 100644 --- a/console-setup/compose.ISO-8859-13.inc +++ b/console-setup/compose.ISO-8859-13.inc @@ -76,12 +76,8 @@ compose '/' 'c' to ' compose '/' 'l' to 'ù' compose '/' 'o' to '¸' compose '/' 'u' to 'µ' -compose '0' 'c' to '©' -compose '0' 's' to '§' -compose '0' 'x' to '¤' compose '1' '2' to '½' compose '1' '4' to '¼' -compose '2' 's' to '²' compose '3' '4' to '¾' compose ':' '-' to '÷' compose ';' 'A' to 'À' @@ -145,25 +141,21 @@ compose '_' 'u' to ' compose 'a' 'e' to '¿' compose 'a' 'o' to 'å' compose 'a' 't' to '@' -compose 'b' 'v' to '¦' +compose 'c' '0' to '©' compose 'c' 'o' to '©' compose 'm' 'u' to 'µ' compose 'o' 'c' to '©' -compose 'o' 'r' to '®' -compose 'o' 's' to '§' +compose 'o' 'x' to '¤' +compose 'r' 'o' to '®' compose 's' '0' to '§' compose 's' '1' to '¹' compose 's' '2' to '²' compose 's' '3' to '³' +compose 's' 'o' to '§' +compose 'v' 'b' to '¦' compose 'x' '0' to '¤' compose 'x' 'o' to '¤' compose '|' 'c' to '¢' compose '|' '|' to '¦' compose '~' 'O' to 'Õ' compose '~' 'o' to 'õ' -compose '°' 'A' to 'Å' -compose '°' 'E' to 'Ë' -compose '°' 'Z' to 'Ý' -compose '°' 'a' to 'å' -compose '°' 'e' to 'ë' -compose '°' 'z' to 'ý' diff --git a/console-setup/compose.ISO-8859-14.inc b/console-setup/compose.ISO-8859-14.inc index 21f29ee..e2835df 100644 --- a/console-setup/compose.ISO-8859-14.inc +++ b/console-setup/compose.ISO-8859-14.inc @@ -56,9 +56,6 @@ compose '/' '<' to '\\' compose '/' 'O' to 'Ø' compose '/' '^' to '|' compose '/' 'o' to 'ø' -compose '0' 'c' to '©' -compose '0' 'r' to '®' -compose '0' 's' to '§' compose '<' '/' to '\\' compose '=' 'l' to '£' compose '>' 'A' to 'Â' @@ -117,14 +114,14 @@ compose '`' 'w' to ' compose '`' 'y' to '¼' compose 'a' 'e' to 'æ' compose 'a' 't' to '@' +compose 'c' '0' to '©' compose 'c' 'o' to '©' -compose 'l' 'v' to '|' compose 'o' 'c' to '©' -compose 'o' 'r' to '®' -compose 'o' 's' to '§' compose 'r' '0' to '®' +compose 'r' 'o' to '®' compose 's' '0' to '§' compose 's' 'o' to '§' +compose 'v' 'l' to '|' compose '~' 'A' to 'Ã' compose '~' 'N' to 'Ñ' compose '~' 'O' to 'Õ' diff --git a/console-setup/compose.ISO-8859-15.inc b/console-setup/compose.ISO-8859-15.inc index 63c89db..79c92ed 100644 --- a/console-setup/compose.ISO-8859-15.inc +++ b/console-setup/compose.ISO-8859-15.inc @@ -55,9 +55,6 @@ compose '/' '^' to '|' compose '/' 'c' to '¢' compose '/' 'o' to 'ø' compose '/' 'u' to 'µ' -compose '0' 'c' to '©' -compose '0' 's' to '§' -compose '1' 's' to '¹' compose ':' '-' to '÷' compose '<' '/' to '\\' compose '<' '<' to '«' @@ -139,8 +136,7 @@ compose 'c' 'o' to ' compose 'e' '=' to '¤' compose 'o' 'c' to '©' compose 'o' 'e' to '½' -compose 'o' 'r' to '®' -compose 'o' 's' to '§' +compose 'r' 'o' to '®' compose 's' '0' to '§' compose 's' '1' to '¹' compose 's' '2' to '²' @@ -155,5 +151,3 @@ compose '~' 'O' to ' compose '~' 'a' to 'ã' compose '~' 'n' to 'ñ' compose '~' 'o' to 'õ' -compose '°' 'A' to 'Å' -compose '°' 'a' to 'å' diff --git a/console-setup/compose.ISO-8859-2.inc b/console-setup/compose.ISO-8859-2.inc index 40734c3..6692ee3 100644 --- a/console-setup/compose.ISO-8859-2.inc +++ b/console-setup/compose.ISO-8859-2.inc @@ -46,13 +46,9 @@ compose '.' 'e' to ' compose '.' 'i' to '¹' compose '.' 'u' to 'ù' compose '.' 'z' to '¿' -compose '.' ' ' to 'ÿ' -compose '.' 'ÿ' to 'ÿ' compose '/' '/' to '\\' compose '/' '<' to '\\' compose '/' '^' to '|' -compose '0' 's' to '§' -compose '0' 'x' to '¤' compose ':' '-' to '÷' compose '<' '/' to '\\' compose '<' '<' to '·' @@ -116,7 +112,6 @@ compose '^' 'O' to ' compose '^' 'a' to 'â' compose '^' 'i' to 'î' compose '^' 'o' to 'ô' -compose '_' ' ' to '¯' compose 'a' 'U' to 'ã' compose 'l' '-' to '³' compose 'o' 'e' to '½' @@ -127,39 +122,3 @@ compose 'v' 'l' to '|' compose 'x' '0' to '¤' compose 'x' 'o' to '¤' compose 'z' '.' to '¿' -compose '¢' 'A' to 'Ã' -compose '¢' 'a' to 'ã' -compose '°' 'A' to 'Å' -compose '°' 'U' to 'Ù' -compose '°' 'a' to 'å' -compose '°' 'u' to 'ù' -compose '°' ' ' to '°' -compose '°' '°' to '°' -compose '²' 'A' to '¡' -compose '²' 'E' to 'Ê' -compose '²' 'a' to '±' -compose '²' 'e' to 'ê' -compose '·' 'C' to 'È' -compose '·' 'D' to 'Ï' -compose '·' 'E' to 'Ì' -compose '·' 'L' to '¥' -compose '·' 'N' to 'Ò' -compose '·' 'R' to 'Ø' -compose '·' 'S' to '©' -compose '·' 'T' to '«' -compose '·' 'Z' to '®' -compose '·' 'c' to 'è' -compose '·' 'd' to 'ï' -compose '·' 'e' to 'ì' -compose '·' 'l' to 'µ' -compose '·' 'n' to 'ò' -compose '·' 'r' to 'ø' -compose '·' 's' to '¹' -compose '·' 't' to '»' -compose '·' 'z' to '¾' -compose '¸' 'C' to 'Ç' -compose '¸' 'S' to 'ª' -compose '¸' 'T' to 'Þ' -compose '¸' 'c' to 'ç' -compose '¸' 's' to 'º' -compose '¸' 't' to 'þ' diff --git a/console-setup/compose.ISO-8859-3.inc b/console-setup/compose.ISO-8859-3.inc index 5e0daef..7e50b6c 100644 --- a/console-setup/compose.ISO-8859-3.inc +++ b/console-setup/compose.ISO-8859-3.inc @@ -57,9 +57,6 @@ compose '/' '/' to '\\' compose '/' '<' to '\\' compose '/' '^' to '|' compose '/' 'u' to 'µ' -compose '0' 's' to '§' -compose '2' 's' to '²' -compose '3' 's' to '³' compose ':' '-' to '÷' compose '<' '/' to '\\' compose '=' 'c' to '¤' @@ -136,8 +133,10 @@ compose '`' 'i' to ' compose '`' 'o' to 'ò' compose '`' 'u' to 'ù' compose 'g' 'U' to '»' -compose 'o' 'r' to '®' +compose 'r' 'o' to '®' compose 's' '0' to '§' +compose 's' '2' to '²' +compose 's' '3' to '³' compose 's' 'o' to '§' compose 'u' 'u' to 'ý' compose 'v' 'l' to '|' @@ -145,23 +144,3 @@ compose '~' 'A' to ' compose '~' 'O' to 'Õ' compose '~' 'a' to 'ã' compose '~' 'o' to 'õ' -compose '¢' 'G' to '«' -compose '¢' 'U' to 'Ý' -compose '¢' 'g' to '»' -compose '¢' 'u' to 'ý' -compose '¨' 'A' to 'Ä' -compose '¨' 'E' to 'Ë' -compose '¨' 'I' to 'Ï' -compose '¨' 'O' to 'Ö' -compose '¨' 'U' to 'Ü' -compose '¨' 'Y' to '¾' -compose '¨' 'a' to 'ä' -compose '¨' 'e' to 'ë' -compose '¨' 'i' to 'ï' -compose '¨' 'o' to 'ö' -compose '¨' 'u' to 'ü' -compose '¨' 'y' to 'ÿ' -compose '°' 'A' to 'Å' -compose '°' 'a' to 'å' -compose '¸' 'S' to 'ª' -compose '¸' 's' to 'º' diff --git a/console-setup/compose.ISO-8859-4.inc b/console-setup/compose.ISO-8859-4.inc index c95e946..4598a22 100644 --- a/console-setup/compose.ISO-8859-4.inc +++ b/console-setup/compose.ISO-8859-4.inc @@ -49,12 +49,10 @@ compose '-' 'u' to ' compose '.' '.' to 'ÿ' compose '.' 'E' to 'Ì' compose '.' 'e' to 'ì' -compose '.' 'ÿ' to 'ÿ' compose '/' 'O' to 'Ø' compose '/' 'T' to '¬' compose '/' 'o' to 'ø' compose '/' 't' to '¼' -compose '0' 's' to '§' compose ':' '-' to '÷' compose '<' '<' to '·' compose '<' 'C' to 'È' @@ -105,10 +103,10 @@ compose '_' 'e' to ' compose '_' 'i' to 'ï' compose '_' 'o' to 'ò' compose '_' 'u' to 'þ' -compose '_' '¯' to '¯' compose 'a' 'e' to 'æ' compose 'n' 'g' to '¿' compose 'o' 'x' to '¤' +compose 's' '0' to '§' compose 's' 'o' to '§' compose 't' '-' to '¼' compose 'x' '0' to '¤' @@ -121,5 +119,3 @@ compose '~' 'a' to ' compose '~' 'i' to 'µ' compose '~' 'o' to 'õ' compose '~' 'u' to 'ý' -compose '°' 'A' to 'Å' -compose '°' 'a' to 'å' diff --git a/console-setup/compose.ISO-8859-7.inc b/console-setup/compose.ISO-8859-7.inc index 6142e6c..1aa936a 100644 --- a/console-setup/compose.ISO-8859-7.inc +++ b/console-setup/compose.ISO-8859-7.inc @@ -2,10 +2,6 @@ compose '!' '^' to '¦' compose '!' 's' to '§' compose '"' '"' to '¨' -compose '"' 'É' to 'Ú' -compose '"' 'Õ' to 'Û' -compose '"' 'é' to 'ú' -compose '"' 'õ' to 'û' compose '(' '(' to '[' compose '(' '-' to '{' compose '(' 'c' to '©' @@ -26,9 +22,7 @@ compose '.' '^' to ' compose '/' '/' to '\\' compose '/' '<' to '\\' compose '/' '^' to '|' -compose '0' 's' to '§' compose '1' '2' to '½' -compose '2' 's' to '²' compose '<' '/' to '\\' compose '<' '<' to '«' compose '<' '\'' to '¡' @@ -38,20 +32,6 @@ compose '>' '\'' to ' compose '\'' '<' to '¡' compose '\'' '>' to '¢' compose '\'' '\'' to '´' -compose '\'' 'Á' to '¶' -compose '\'' 'Å' to '¸' -compose '\'' 'Ç' to '¹' -compose '\'' 'É' to 'º' -compose '\'' 'Ï' to '¼' -compose '\'' 'Õ' to '¾' -compose '\'' 'Ù' to '¿' -compose '\'' 'á' to 'Ü' -compose '\'' 'å' to 'Ý' -compose '\'' 'ç' to 'Þ' -compose '\'' 'é' to 'ß' -compose '\'' 'ï' to 'ü' -compose '\'' 'õ' to 'ý' -compose '\'' 'ù' to 'þ' compose '^' '!' to '¦' compose '^' '.' to '·' compose '^' '/' to '|' @@ -59,33 +39,14 @@ compose '^' '0' to ' compose '^' '2' to '²' compose '^' '3' to '³' compose 'a' 't' to '@' -compose 'b' 'v' to '¦' compose 'c' '0' to '©' compose 'c' 'o' to '©' compose 'o' 'c' to '©' -compose 'o' 's' to '§' compose 's' '0' to '§' +compose 's' '2' to '²' compose 's' '3' to '³' compose 's' 'o' to '§' compose 'v' 'b' to '¦' compose 'v' 'l' to '|' compose '|' '|' to '¦' compose '~' '~' to '¯' -compose 'Á' '\'' to '¶' -compose 'Å' '\'' to '¸' -compose 'Ç' '\'' to '¹' -compose 'É' '"' to 'Ú' -compose 'É' '\'' to 'º' -compose 'Ï' '\'' to '¼' -compose 'Õ' '"' to 'Û' -compose 'Õ' '\'' to '¾' -compose 'Ù' '\'' to '¿' -compose 'á' '\'' to 'Ü' -compose 'å' '\'' to 'Ý' -compose 'ç' '\'' to 'Þ' -compose 'é' '"' to 'ú' -compose 'é' '\'' to 'ß' -compose 'ï' '\'' to 'ü' -compose 'õ' '"' to 'û' -compose 'õ' '\'' to 'ý' -compose 'ù' '\'' to 'þ' diff --git a/console-setup/compose.ISO-8859-9.inc b/console-setup/compose.ISO-8859-9.inc index 54738d7..e642e1b 100644 --- a/console-setup/compose.ISO-8859-9.inc +++ b/console-setup/compose.ISO-8859-9.inc @@ -62,9 +62,6 @@ compose '/' '^' to '|' compose '/' 'c' to '¢' compose '/' 'o' to 'ø' compose '/' 'u' to 'µ' -compose '0' 'c' to '©' -compose '0' 's' to '§' -compose '3' 's' to '³' compose ':' '-' to '÷' compose '<' '/' to '\\' compose '<' '<' to '«' @@ -138,12 +135,13 @@ compose 'a' 'e' to ' compose 'c' '0' to '©' compose 'c' 'o' to '©' compose 'g' 'U' to 'ð' -compose 'l' 'v' to '|' compose 'o' 'c' to '©' compose 'o' 'e' to '¼' compose 'r' 'o' to '®' +compose 's' '0' to '§' compose 's' '1' to '¹' compose 's' '2' to '²' +compose 's' '3' to '³' compose 's' 'o' to '§' compose 't' 'h' to 'þ' compose 'v' 'Z' to '´' @@ -156,19 +154,3 @@ compose '~' 'O' to ' compose '~' 'a' to 'ã' compose '~' 'n' to 'ñ' compose '~' 'o' to 'õ' -compose '¨' 'A' to 'Ä' -compose '¨' 'E' to 'Ë' -compose '¨' 'I' to 'Ï' -compose '¨' 'O' to 'Ö' -compose '¨' 'U' to 'Ü' -compose '¨' 'Y' to '¾' -compose '¨' 'a' to 'ä' -compose '¨' 'e' to 'ë' -compose '¨' 'i' to 'ï' -compose '¨' 'o' to 'ö' -compose '¨' 'u' to 'ü' -compose '¨' 'y' to 'ÿ' -compose '°' 'A' to 'Å' -compose '°' 'a' to 'å' -compose '¸' 'S' to 'Þ' -compose '¸' 's' to 'þ' diff --git a/cron.d/php b/cron.d/php new file mode 100644 index 0000000..84e5d10 --- /dev/null +++ b/cron.d/php @@ -0,0 +1,14 @@ +# /etc/cron.d/php@PHP_VERSION@: crontab fragment for PHP +# This purges session files in session.save_path older than X, +# where X is defined in seconds as the largest value of +# session.gc_maxlifetime from all your SAPI php.ini files +# or 24 minutes if not defined. The script triggers only +# when session.save_handler=files. +# +# WARNING: The scripts tries hard to honour all relevant +# session PHP options, but if you do something unusual +# you have to disable this script and take care of your +# sessions yourself. + +# Look for and purge old sessions every 30 minutes +09,39 * * * * root [ -x /usr/lib/php/sessionclean ] && if [ ! -d /run/systemd/system ]; then /usr/lib/php/sessionclean; fi diff --git a/cron.daily/apache2 b/cron.daily/apache2 index d5f9cbc..6461f07 100755 --- a/cron.daily/apache2 +++ b/cron.daily/apache2 @@ -1,30 +1,25 @@ #!/bin/sh -# run htcacheclean +# run htcacheclean if set to 'cron' mode set -e set -u type htcacheclean > /dev/null 2>&1 || exit 0 -[ -e /etc/default/apache2 ] || exit 0 +[ -e /etc/default/apache-htcacheclean ] || exit 0 -# edit /etc/default/apache2 to change this +# edit /etc/default/apache-htcacheclean to change this HTCACHECLEAN_MODE=daemon HTCACHECLEAN_RUN=auto HTCACHECLEAN_SIZE=300M HTCACHECLEAN_PATH=/var/cache/apache2/mod_cache_disk HTCACHECLEAN_OPTIONS="" -. /etc/default/apache2 +. /etc/default/apache-htcacheclean [ "$HTCACHECLEAN_MODE" = "cron" ] || exit 0 -[ "$HTCACHECLEAN_RUN" = "yes" ] || -( [ "$HTCACHECLEAN_RUN" = "auto" ] && \ - [ -e /etc/apache2/mods-enabled/cache_disk.load ] ) || exit 0 - htcacheclean ${HTCACHECLEAN_OPTIONS} \ -p${HTCACHECLEAN_PATH} \ -l${HTCACHECLEAN_SIZE} - diff --git a/cron.daily/apt b/cron.daily/apt deleted file mode 100755 index ee0761b..0000000 --- a/cron.daily/apt +++ /dev/null @@ -1,507 +0,0 @@ -#!/bin/sh -#set -e -# -# This file understands the following apt configuration variables: -# Values here are the default. -# Create /etc/apt/apt.conf.d/02periodic file to set your preference. -# -# Dir "/"; -# - RootDir for all configuration files -# -# Dir::Cache "var/cache/apt/"; -# - Set apt package cache directory -# -# Dir::Cache::Archives "archives/"; -# - Set package archive directory -# -# APT::Periodic::Enable "1"; -# - Enable the update/upgrade script (0=disable) -# -# APT::Periodic::BackupArchiveInterval "0"; -# - Backup after n-days if archive contents changed.(0=disable) -# -# APT::Periodic::BackupLevel "3"; -# - Backup level.(0=disable), 1 is invalid. -# -# Dir::Cache::Backup "backup/"; -# - Set periodic package backup directory -# -# APT::Archives::MaxAge "0"; (old, deprecated) -# APT::Periodic::MaxAge "0"; (new) -# - Set maximum allowed age of a cache package file. If a cache -# package file is older it is deleted (0=disable) -# -# APT::Archives::MinAge "2"; (old, deprecated) -# APT::Periodic::MinAge "2"; (new) -# - Set minimum age of a package file. If a file is younger it -# will not be deleted (0=disable). Useful to prevent races -# and to keep backups of the packages for emergency. -# -# APT::Archives::MaxSize "0"; (old, deprecated) -# APT::Periodic::MaxSize "0"; (new) -# - Set maximum size of the cache in MB (0=disable). If the cache -# is bigger, cached package files are deleted until the size -# requirement is met (the oldest packages will be deleted -# first). -# -# APT::Periodic::Update-Package-Lists "0"; -# - Do "apt-get update" automatically every n-days (0=disable) -# -# APT::Periodic::Download-Upgradeable-Packages "0"; -# - Do "apt-get upgrade --download-only" every n-days (0=disable) -# -# APT::Periodic::Download-Upgradeable-Packages-Debdelta "1"; -# - Use debdelta-upgrade to download updates if available (0=disable) -# -# APT::Periodic::Unattended-Upgrade "0"; -# - Run the "unattended-upgrade" security upgrade script -# every n-days (0=disabled) -# Requires the package "unattended-upgrades" and will write -# a log in /var/log/unattended-upgrades -# -# APT::Periodic::AutocleanInterval "0"; -# - Do "apt-get autoclean" every n-days (0=disable) -# -# APT::Periodic::Verbose "0"; -# - Send report mail to root -# 0: no report (or null string) -# 1: progress report (actually any string) -# 2: + command outputs (remove -qq, remove 2>/dev/null, add -d) -# 3: + trace on - -check_stamp() -{ - stamp="$1" - interval="$2" - - if [ $interval -eq 0 ]; then - debug_echo "check_stamp: interval=0" - # treat as no time has passed - return 1 - fi - - if [ ! -f $stamp ]; then - debug_echo "check_stamp: missing time stamp file: $stamp." - # treat as enough time has passed - return 0 - fi - - # compare midnight today to midnight the day the stamp was updated - stamp_file="$stamp" - stamp=$(date --date=$(date -r $stamp_file --iso-8601) +%s 2>/dev/null) - if [ "$?" != "0" ]; then - # Due to some timezones returning 'invalid date' for midnight on - # certain dates (e.g. America/Sao_Paulo), if date returns with error - # remove the stamp file and return 0. See coreutils bug: - # http://lists.gnu.org/archive/html/bug-coreutils/2007-09/msg00176.html - rm -f "$stamp_file" - return 0 - fi - - now=$(date --date=$(date --iso-8601) +%s 2>/dev/null) - if [ "$?" != "0" ]; then - # As above, due to some timezones returning 'invalid date' for midnight - # on certain dates (e.g. America/Sao_Paulo), if date returns with error - # return 0. - return 0 - fi - - delta=$(($now-$stamp)) - - # interval is in days, convert to sec. - interval=$(($interval*60*60*24)) - debug_echo "check_stamp: interval=$interval, now=$now, stamp=$stamp, delta=$delta (sec)" - - # remove timestamps a day (or more) in the future and force re-check - if [ $stamp -gt $(($now+86400)) ]; then - echo "WARNING: file $stamp_file has a timestamp in the future: $stamp" - rm -f "$stamp_file" - return 0 - fi - - if [ $delta -ge $interval ]; then - return 0 - fi - - return 1 -} - -update_stamp() -{ - stamp="$1" - touch $stamp -} - -# we check here if autoclean was enough sizewise -check_size_constraints() -{ - MaxAge=0 - eval $(apt-config shell MaxAge APT::Archives::MaxAge) - eval $(apt-config shell MaxAge APT::Periodic::MaxAge) - - MinAge=2 - eval $(apt-config shell MinAge APT::Archives::MinAge) - eval $(apt-config shell MinAge APT::Periodic::MinAge) - - MaxSize=0 - eval $(apt-config shell MaxSize APT::Archives::MaxSize) - eval $(apt-config shell MaxSize APT::Periodic::MaxSize) - - Cache="/var/cache/apt/archives/" - eval $(apt-config shell Cache Dir::Cache::archives/d) - - # sanity check - if [ -z "$Cache" ]; then - echo "empty Dir::Cache::archives, exiting" - exit - fi - - # check age - if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then - debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge and ctime>$MinAge and mtime>$MinAge" - find $Cache -name "*.deb" \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f - elif [ ! $MaxAge -eq 0 ]; then - debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge only" - find $Cache -name "*.deb" -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f - else - debug_echo "skip aging since MaxAge is 0" - fi - - # check size - if [ ! $MaxSize -eq 0 ]; then - # maxSize is in MB - MaxSize=$(($MaxSize*1024)) - - #get current time - now=$(date --date=$(date --iso-8601) +%s) - MinAge=$(($MinAge*24*60*60)) - - # reverse-sort by mtime - for file in $(ls -rt $Cache/*.deb 2>/dev/null); do - du=$(du -s $Cache) - size=${du%%/*} - # check if the cache is small enough - if [ $size -lt $MaxSize ]; then - debug_echo "end remove by archive size: size=$size < $MaxSize" - break - fi - - # check for MinAge of the file - if [ $MinAge -ne 0 ]; then - # check both ctime and mtime - mtime=$(stat -c %Y $file) - ctime=$(stat -c %Z $file) - if [ $mtime -gt $ctime ]; then - delta=$(($now-$mtime)) - else - delta=$(($now-$ctime)) - fi - if [ $delta -le $MinAge ]; then - debug_echo "skip remove by archive size: $file, delta=$delta < $MinAge" - break - else - # delete oldest file - debug_echo "remove by archive size: $file, delta=$delta >= $MinAge (sec), size=$size >= $MaxSize" - rm -f $file - fi - fi - done - fi -} - -# deal with the Apt::Periodic::BackupArchiveInterval -do_cache_backup() -{ - BackupArchiveInterval="$1" - if [ $BackupArchiveInterval -eq 0 ]; then - return - fi - - # Set default values and normalize - CacheDir="/var/cache/apt" - eval $(apt-config shell CacheDir Dir::Cache/d) - CacheDir=${CacheDir%/} - if [ -z "$CacheDir" ]; then - debug_echo "practically empty Dir::Cache, exiting" - return 0 - fi - - Cache="${CacheDir}/archives/" - eval $(apt-config shell Cache Dir::Cache::Archives/d) - if [ -z "$Cache" ]; then - debug_echo "practically empty Dir::Cache::archives, exiting" - return 0 - fi - - BackupLevel=3 - eval $(apt-config shell BackupLevel APT::Periodic::BackupLevel) - if [ $BackupLevel -le 1 ]; then - BackupLevel=2 ; - fi - - Back="${CacheDir}/backup/" - eval $(apt-config shell Back Dir::Cache::Backup/d) - if [ -z "$Back" ]; then - echo "practically empty Dir::Cache::Backup, exiting" 1>&2 - return - fi - - CacheArchive="$(basename "${Cache}")" - test -n "${CacheArchive}" || CacheArchive="archives" - BackX="${Back}${CacheArchive}/" - for x in $(seq 0 1 $((${BackupLevel}-1))); do - eval "Back${x}=${Back}${x}/" - done - - # backup after n-days if archive contents changed. - # (This uses hardlink to save disk space) - BACKUP_ARCHIVE_STAMP=/var/lib/apt/periodic/backup-archive-stamp - if check_stamp $BACKUP_ARCHIVE_STAMP $BackupArchiveInterval; then - if [ $({(cd $Cache 2>/dev/null; find . -name "*.deb"); (cd $Back0 2>/dev/null;find . -name "*.deb") ;}| sort|uniq -u|wc -l) -ne 0 ]; then - mkdir -p $Back - rm -rf $Back$((${BackupLevel}-1)) - for y in $(seq $((${BackupLevel}-1)) -1 1); do - eval BackY=${Back}$y - eval BackZ=${Back}$(($y-1)) - if [ -e $BackZ ]; then - mv -f $BackZ $BackY ; - fi - done - cp -la $Cache $Back ; mv -f $BackX $Back0 - update_stamp $BACKUP_ARCHIVE_STAMP - debug_echo "backup with hardlinks. (success)" - else - debug_echo "skip backup since same content." - fi - else - debug_echo "skip backup since too new." - fi -} - -# sleep for a random interval of time (default 30min) -# (some code taken from cron-apt, thanks) -random_sleep() -{ - RandomSleep=1800 - eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep) - if [ $RandomSleep -eq 0 ]; then - return - fi - if [ -z "$RANDOM" ] ; then - # A fix for shells that do not have this bash feature. - RANDOM=$(( $(dd if=/dev/urandom bs=2 count=1 2> /dev/null | cksum | cut -d' ' -f1) % 32767 )) - fi - TIME=$(($RANDOM % $RandomSleep)) - debug_echo "sleeping for $TIME seconds" - sleep $TIME -} - - -debug_echo() -{ - # Display message if $VERBOSE >= 1 - if [ "$VERBOSE" -ge 1 ]; then - echo $1 1>&2 - fi -} - -check_power(){ - # laptop check, on_ac_power returns: - # 0 (true) System is on main power - # 1 (false) System is not on main power - # 255 (false) Power status could not be determined - # Desktop systems always return 255 it seems - if which on_ac_power >/dev/null; then - on_ac_power - POWER=$? - if [ $POWER -eq 1 ]; then - debug_echo "exit: system NOT on main power" - return 1 - elif [ $POWER -ne 0 ]; then - debug_echo "power status ($POWER) undetermined, continuing" - fi - debug_echo "system is on main power." - fi - return 0 -} - -# ------------------------ main ---------------------------- - -if test -r /var/lib/apt/extended_states; then - # Backup the 7 last versions of APT's extended_states file - # shameless copy from dpkg cron - if cd /var/backups ; then - if ! cmp -s apt.extended_states.0 /var/lib/apt/extended_states; then - cp -p /var/lib/apt/extended_states apt.extended_states - savelog -c 7 apt.extended_states >/dev/null - fi - fi -fi - -# check apt-config existence -if ! which apt-config >/dev/null ; then - exit 0 -fi - -# check if the user really wants to do something -AutoAptEnable=1 # default is yes -eval $(apt-config shell AutoAptEnable APT::Periodic::Enable) - -if [ $AutoAptEnable -eq 0 ]; then - exit 0 -fi - -# Set VERBOSE mode from apt-config (or inherit from environment) -VERBOSE=0 -eval $(apt-config shell VERBOSE APT::Periodic::Verbose) -debug_echo "verbose level $VERBOSE" -if [ "$VERBOSE" -le 2 ]; then - # quiet for 0,1,2 - XSTDOUT=">/dev/null" - XSTDERR="2>/dev/null" - XAPTOPT="-qq" - XUUPOPT="" -else - XSTDOUT="" - XSTDERR="" - XAPTOPT="" - XUUPOPT="-d" -fi -if [ "$VERBOSE" -ge 3 ]; then - # trace output - set -x -fi - -check_power || exit 0 - -# check if we can lock the cache and if the cache is clean -if which apt-get >/dev/null && ! eval apt-get check $XAPTOPT $XSTDERR ; then - debug_echo "error encountered in cron job with \"apt-get check\"." - exit 0 -fi - -# Global current time in seconds since 1970-01-01 00:00:00 UTC -now=$(date +%s) - -# Support old Archive for compatibility. -# Document only Periodic for all controlling parameters of this script. - -UpdateInterval=0 -eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists) - -DownloadUpgradeableInterval=0 -eval $(apt-config shell DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) - -UnattendedUpgradeInterval=0 -eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) - -AutocleanInterval=0 -eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) - -BackupArchiveInterval=0 -eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterval) - -Debdelta=1 -eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta) - -# check if we actually have to do anything that requires locking the cache -if [ $UpdateInterval -eq 0 ] && - [ $DownloadUpgradeableInterval -eq 0 ] && - [ $UnattendedUpgradeInterval -eq 0 ] && - [ $BackupArchiveInterval -eq 0 ] && - [ $AutocleanInterval -eq 0 ]; then - - # check cache size - check_size_constraints - - exit 0 -fi - -# deal with BackupArchiveInterval -do_cache_backup $BackupArchiveInterval - -# sleep random amount of time to avoid hitting the -# mirrors at the same time -random_sleep -check_power || exit 0 - -# include default system language so that "apt-get update" will -# fetch the right translated package descriptions -if [ -r /etc/default/locale ]; then - . /etc/default/locale - export LANG LANGUAGE LC_MESSAGES LC_ALL -fi - -# update package lists -UPDATED=0 -UPDATE_STAMP=/var/lib/apt/periodic/update-stamp -if check_stamp $UPDATE_STAMP $UpdateInterval; then - if eval apt-get $XAPTOPT -y update $XSTDERR; then - debug_echo "download updated metadata (success)." - if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then - if dbus-send --system / app.apt.dbus.updated boolean:true ; then - debug_echo "send dbus signal (success)" - else - debug_echo "send dbus signal (error)" - fi - else - debug_echo "dbus signal not send (command not available)" - fi - update_stamp $UPDATE_STAMP - UPDATED=1 - else - debug_echo "download updated metadata (error)" - fi -else - debug_echo "download updated metadata (not run)." -fi - -# download all upgradeable packages (if it is requested) -DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp -if [ $UPDATED -eq 1 ] && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then - if [ $Debdelta -eq 1 ]; then - debdelta-upgrade >/dev/null 2>&1 || true - fi - if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then - update_stamp $DOWNLOAD_UPGRADEABLE_STAMP - debug_echo "download upgradable (success)" - else - debug_echo "download upgradable (error)" - fi -else - debug_echo "download upgradable (not run)" -fi - -# auto upgrade all upgradeable packages -UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp -if which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then - if unattended-upgrade $XUUPOPT; then - update_stamp $UPGRADE_STAMP - debug_echo "unattended-upgrade (success)" - else - debug_echo "unattended-upgrade (error)" - fi -else - debug_echo "unattended-upgrade (not run)" -fi - -# autoclean package archive -AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp -if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then - if eval apt-get $XAPTOPT -y autoclean $XSTDERR; then - debug_echo "autoclean (success)." - update_stamp $AUTOCLEAN_STAMP - else - debug_echo "autoclean (error)" - fi -else - debug_echo "autoclean (not run)" -fi - -# check cache size -check_size_constraints - -# -# vim: set sts=4 ai : -# - diff --git a/cron.daily/apt-compat b/cron.daily/apt-compat new file mode 100755 index 0000000..095a44c --- /dev/null +++ b/cron.daily/apt-compat @@ -0,0 +1,55 @@ +#!/bin/sh + +set -e + +# Systemd systems use a systemd timer unit which is preferable to +# run. We want to randomize the apt update and unattended-upgrade +# runs as much as possible to avoid hitting the mirrors all at the +# same time. The systemd time is better at this than the fixed +# cron.daily time +if [ -d /run/systemd/system ]; then + exit 0 +fi + +check_power() +{ + # laptop check, on_ac_power returns: + # 0 (true) System is on main power + # 1 (false) System is not on main power + # 255 (false) Power status could not be determined + # Desktop systems always return 255 it seems + if which on_ac_power >/dev/null 2>&1; then + on_ac_power + POWER=$? + if [ $POWER -eq 1 ]; then + return 1 + fi + fi + return 0 +} + +# sleep for a random interval of time (default 30min) +# (some code taken from cron-apt, thanks) +random_sleep() +{ + RandomSleep=1800 + eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep) + if [ $RandomSleep -eq 0 ]; then + return + fi + if [ -z "$RANDOM" ] ; then + # A fix for shells that do not have this bash feature. + RANDOM=$(( $(dd if=/dev/urandom bs=2 count=1 2> /dev/null | cksum | cut -d' ' -f1) % 32767 )) + fi + TIME=$(($RANDOM % $RandomSleep)) + sleep $TIME +} + +# delay the job execution by a random amount of time +random_sleep + +# ensure we don't do this on battery +check_power || exit 0 + +# run daily job +exec /usr/lib/apt/apt.systemd.daily diff --git a/cron.daily/etckeeper b/cron.daily/etckeeper index 5255691..eb74401 100755 --- a/cron.daily/etckeeper +++ b/cron.daily/etckeeper @@ -1,19 +1,8 @@ #!/bin/sh set -e -if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then +if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then . /etc/etckeeper/etckeeper.conf if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then - # avoid autocommit if an install run is in progress - lockfile=/var/cache/etckeeper/packagelist.pre-install - if [ -e "$lockfile" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then - rm -f "$lockfile" # stale - fi - if [ ! -e "$lockfile" ]; then - AVOID_SPECIAL_FILE_WARNING=1 - export AVOID_SPECIAL_FILE_WARNING - if etckeeper unclean; then - etckeeper commit "daily autocommit" >/dev/null - fi - fi + /etc/etckeeper/daily fi fi diff --git a/cron.daily/man-db b/cron.daily/man-db index c374604..0aeb8a5 100755 --- a/cron.daily/man-db +++ b/cron.daily/man-db @@ -13,18 +13,12 @@ fi if ! [ -d /var/cache/man ]; then # Recover from deletion, per FHS. - mkdir -p /var/cache/man - chown man:root /var/cache/man || true - chmod 2755 /var/cache/man + install -d -o man -g man -m 0755 /var/cache/man fi # expunge old catman pages which have not been read in a week if [ ! -d /run/systemd/system ] && [ -d /var/cache/man ]; then cd / - if ! dpkg-statoverride --list /var/cache/man >/dev/null 2>&1; then - find /var/cache/man -ignore_readdir_race ! -user man -print0 | \ - xargs -r0 chown -f man || true - fi start-stop-daemon --start --pidfile /dev/null --startas /bin/sh \ --oknodo --chuid man $iosched_idle -- -c \ "find /var/cache/man -type f -name '*.gz' -atime +6 -print0 | \ diff --git a/cron.daily/mlocate b/cron.daily/mlocate index aeb1a88..331d063 100755 --- a/cron.daily/mlocate +++ b/cron.daily/mlocate @@ -18,4 +18,10 @@ if [ -x /usr/bin/ionice ] && IONICE="/usr/bin/ionice -c3" fi -flock --nonblock /run/mlocate.daily.lock $IONICE /usr/bin/updatedb.mlocate +# See nocache(1) +NOCACHE= +if [ -x /usr/bin/nocache ]; then + NOCACHE="/usr/bin/nocache" +fi + +flock --nonblock /run/mlocate.daily.lock $NOCACHE $IONICE /usr/bin/updatedb.mlocate diff --git a/cron.weekly/man-db b/cron.weekly/man-db index b890d38..87da3b8 100755 --- a/cron.weekly/man-db +++ b/cron.weekly/man-db @@ -13,9 +13,7 @@ fi if ! [ -d /var/cache/man ]; then # Recover from deletion, per FHS. - mkdir -p /var/cache/man - chown man:root /var/cache/man || true - chmod 2755 /var/cache/man + install -d -o man -g man -m 0755 /var/cache/man fi # regenerate man database diff --git a/dbconfig-common/phpmyadmin.conf b/dbconfig-common/phpmyadmin.conf index 5c8bc57..c464781 100644 --- a/dbconfig-common/phpmyadmin.conf +++ b/dbconfig-common/phpmyadmin.conf @@ -17,7 +17,7 @@ dbc_remove='' # dbc_dbtype: type of underlying database to use # this exists primarily to let dbconfig-common know what database -# type to use when a package supports multiple database types. +# type to use when a package supports multiple database types. # don't change this value unless you know for certain that this # package supports multiple database types dbc_dbtype='mysql' @@ -31,27 +31,38 @@ dbc_dbuser='' # to a database, if one is required dbc_dbpass='' -# dbc_dbserver: database host. +# dbc_dballow: allowed host to connect from +# only for database types that support specifying the host from +# which the database user is allowed to connect from +# this string defines for which host the dbc_dbuser is allowed +# to connect +# this value is only really used again when you reconfigure the +# package +dbc_dballow='' + +# dbc_dbserver: database host. # leave unset to use localhost (or a more efficient local method # if it exists). -dbc_dbserver='' +dbc_dbserver='localhost' # dbc_dbport: remote database port # leave unset to use the default. only applicable if you are # using a remote database. -dbc_dbport='' +dbc_dbport='3306' # dbc_dbname: name of database # this is the name of your application's database. -dbc_dbname='' +dbc_dbname='phpmyadmin' # dbc_dbadmin: name of the administrative user # this is the administrative user that is used to create all of the above +# The exception is the MySQL/MariaDB localhost case, where this value is +# ignored and instead is determined from /etc/mysql/debian.cnf. dbc_dbadmin='' # dbc_basepath: base directory to hold database files # leave unset to use the default. only applicable if you are -# using a local (filesystem based) database. +# using a local (filesystem based) database. dbc_basepath='' ## diff --git a/dbus-1/session.conf b/dbus-1/session.conf deleted file mode 100644 index 251b58a..0000000 --- a/dbus-1/session.conf +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - session - - - - - unix:tmpdir=/tmp - - - EXTERNAL - - - - - - - - - - - - - - session.d - - - session-local.conf - - contexts/dbus_contexts - - - - - 1000000000 - 250000000 - 1000000000 - 250000000 - 1000000000 - - 120000 - 240000 - 150000 - 100000 - 10000 - 100000 - 10000 - 50000 - 50000 - 50000 - - diff --git a/dbus-1/session.conf b/dbus-1/session.conf new file mode 120000 index 0000000..b4a3252 --- /dev/null +++ b/dbus-1/session.conf @@ -0,0 +1 @@ +/usr/share/dbus-1/session.conf \ No newline at end of file diff --git a/dbus-1/system.conf b/dbus-1/system.conf deleted file mode 100644 index 891bc00..0000000 --- a/dbus-1/system.conf +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - system - - - messagebus - - - - - - - - - /usr/lib/dbus-1.0/dbus-daemon-launch-helper - - - /var/run/dbus/pid - - - - - - EXTERNAL - - - unix:path=/var/run/dbus/system_bus_socket - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - system.d - - - system-local.conf - - contexts/dbus_contexts - - diff --git a/dbus-1/system.conf b/dbus-1/system.conf new file mode 120000 index 0000000..f22bf8f --- /dev/null +++ b/dbus-1/system.conf @@ -0,0 +1 @@ +/usr/share/dbus-1/system.conf \ No newline at end of file diff --git a/dbus-1/system.d/org.freedesktop.login1.conf b/dbus-1/system.d/org.freedesktop.login1.conf index 1318328..c89e404 100644 --- a/dbus-1/system.d/org.freedesktop.login1.conf +++ b/dbus-1/system.d/org.freedesktop.login1.conf @@ -88,6 +88,42 @@ send_interface="org.freedesktop.login1.Manager" send_member="ActivateSessionOnSeat"/> + + + + + + + + + + + + + + + + + + @@ -128,6 +164,26 @@ send_interface="org.freedesktop.login1.Manager" send_member="CanHybridSleep"/> + + + + + + + + + + @@ -136,6 +192,10 @@ send_interface="org.freedesktop.login1.Manager" send_member="FlushDevices"/> + + @@ -152,14 +212,34 @@ send_interface="org.freedesktop.login1.Seat" send_member="SwitchToNext"/> + + + + + + + + + + @@ -180,6 +260,14 @@ send_interface="org.freedesktop.login1.Session" send_member="PauseDeviceComplete"/> + + + + diff --git a/dbus-1/system.d/org.freedesktop.machine1.conf b/dbus-1/system.d/org.freedesktop.machine1.conf deleted file mode 100644 index 3a77c70..0000000 --- a/dbus-1/system.d/org.freedesktop.machine1.conf +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbus-1/system.d/org.freedesktop.network1.conf b/dbus-1/system.d/org.freedesktop.network1.conf new file mode 100644 index 0000000..52dad33 --- /dev/null +++ b/dbus-1/system.d/org.freedesktop.network1.conf @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dbus-1/system.d/org.freedesktop.resolve1.conf b/dbus-1/system.d/org.freedesktop.resolve1.conf new file mode 100644 index 0000000..25b0977 --- /dev/null +++ b/dbus-1/system.d/org.freedesktop.resolve1.conf @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + diff --git a/dbus-1/system.d/org.freedesktop.systemd1.conf b/dbus-1/system.d/org.freedesktop.systemd1.conf index 9dfca81..a61677e 100644 --- a/dbus-1/system.d/org.freedesktop.systemd1.conf +++ b/dbus-1/system.d/org.freedesktop.systemd1.conf @@ -28,6 +28,8 @@ + + @@ -50,6 +52,10 @@ send_interface="org.freedesktop.systemd1.Manager" send_member="GetUnitByPID"/> + + @@ -66,14 +72,30 @@ send_interface="org.freedesktop.systemd1.Manager" send_member="ListUnitsFiltered"/> + + + + + + + + @@ -94,6 +116,140 @@ send_interface="org.freedesktop.systemd1.Manager" send_member="GetDefaultTarget"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/debian_version b/debian_version index 43b1584..dd98ee6 100644 --- a/debian_version +++ b/debian_version @@ -1 +1 @@ -8.8 +9.0 diff --git a/default/apache-htcacheclean b/default/apache-htcacheclean new file mode 100644 index 0000000..73637fc --- /dev/null +++ b/default/apache-htcacheclean @@ -0,0 +1,22 @@ +# This file must only contain KEY=VALUE lines. Do not use advanced +# shell script constructs! + +## run mode: cron, daemon +## run in daemon mode or as daily cron job +## default: daemon +HTCACHECLEAN_MODE=daemon + +## cache size +HTCACHECLEAN_SIZE=300M + +## interval: if in daemon mode, clean cache every x minutes +HTCACHECLEAN_DAEMON_INTERVAL=120 + +## path to cache +## must be the same as in CacheRoot directive +#HTCACHECLEAN_PATH=/var/cache/apache2/mod_cache_disk + +## additional options: +## -n : be nice +## -t : remove empty directories +HTCACHECLEAN_OPTIONS="-n" diff --git a/default/apache2 b/default/apache2 deleted file mode 100644 index 020f079..0000000 --- a/default/apache2 +++ /dev/null @@ -1,26 +0,0 @@ -### htcacheclean settings ### - -## run htcacheclean: yes, no, auto -## auto means run if /etc/apache2/mods-enabled/cache_disk.load exists -## default: auto -HTCACHECLEAN_RUN=auto - -## run mode: cron, daemon -## run in daemon mode or as daily cron job -## default: daemon -HTCACHECLEAN_MODE=daemon - -## cache size -HTCACHECLEAN_SIZE=300M - -## interval: if in daemon mode, clean cache every x minutes -HTCACHECLEAN_DAEMON_INTERVAL=120 - -## path to cache -## must be the same as in CacheRoot directive -HTCACHECLEAN_PATH=/var/cache/apache2/mod_cache_disk - -## additional options: -## -n : be nice -## -t : remove empty directories -HTCACHECLEAN_OPTIONS="-n" diff --git a/default/chrony b/default/chrony new file mode 100644 index 0000000..929dea0 --- /dev/null +++ b/default/chrony @@ -0,0 +1,5 @@ +# This is a configuration file for /etc/init.d/chrony; it allows you to +# pass various options to the chrony daemon without editing the init script. + +# Options to pass to chrony. +DAEMON_OPTS="" diff --git a/default/rcS b/default/rcS index 694ffc7..b60cf6b 100644 --- a/default/rcS +++ b/default/rcS @@ -1,3 +1,6 @@ +################################################################## +# NOTE: This file is ignored when systemd is used as init system # +################################################################## # # /etc/default/rcS # diff --git a/default/rsync b/default/rsync index 13780c2..424b1c0 100644 --- a/default/rsync +++ b/default/rsync @@ -1,4 +1,10 @@ # defaults file for rsync daemon mode +# +# This file is only used for init.d based systems! +# If this system uses systemd, you can specify options etc. for rsync +# in daemon mode by copying /lib/systemd/system/rsync.service to +# /etc/systemd/system/rsync.service and modifying the copy; add required +# options to the ExecStart line. # start rsync in daemon mode from init.d script? # only allowed values are "true", "false", and "inetd" diff --git a/default/tmpfs b/default/tmpfs index a19ba71..80e60a6 100644 --- a/default/tmpfs +++ b/default/tmpfs @@ -1,3 +1,7 @@ +################################################################## +# NOTE: This file is ignored when systemd is used as init system # +################################################################## +# # Configuration for tmpfs filesystems mounted in early boot, before # filesystems from /etc/fstab are mounted. For information about # these variables see the tmpfs(5) manual page. diff --git a/dhcp/debug b/dhcp/debug new file mode 100644 index 0000000..593e7df --- /dev/null +++ b/dhcp/debug @@ -0,0 +1,38 @@ +# +# The purpose of this script is just to show the variables that are +# available to all the scripts in this directory. All these scripts are +# called from dhclient-script, which exports all the variables shown +# before. If you want to debug a problem with your DHCP setup you can +# enable this script and take a look at /tmp/dhclient-script.debug. + +# To enable this script set the following variable to "yes" +RUN="no" + +if [ "$RUN" = "yes" ]; then + echo "$(date): entering ${1%/*}, dumping variables." \ + >> /tmp/dhclient-script.debug + + # loop over the 4 possible prefixes: (empty), cur_, new_, old_ + for prefix in '' 'cur_' 'new_' 'old_'; do + # loop over the DHCP variables passed to dhclient-script + for basevar in reason interface medium alias_ip_address \ + ip_address host_name network_number subnet_mask \ + broadcast_address routers static_routes \ + rfc3442_classless_static_routes \ + domain_name domain_search domain_name_servers \ + netbios_name_servers netbios_scope \ + ntp_servers \ + ip6_address ip6_prefix ip6_prefixlen \ + dhcp6_domain_search dhcp6_name_servers ; do + var="${prefix}${basevar}" + eval "content=\$$var" + + # show only variables with values set + if [ -n "${content}" ]; then + echo "$var='${content}'" >> /tmp/dhclient-script.debug + fi + done + done + + echo '--------------------------' >> /tmp/dhclient-script.debug +fi diff --git a/dhcp/dhclient-enter-hooks.d/debug b/dhcp/dhclient-enter-hooks.d/debug deleted file mode 100644 index 5785a97..0000000 --- a/dhcp/dhclient-enter-hooks.d/debug +++ /dev/null @@ -1,39 +0,0 @@ -# -# The purpose of this script is just to show the variables that are -# available to all the scripts in this directory. All these scripts -# are called from /etc/dhcp3/dhclient-script, which exports all the -# variables shown before. If you want to debug a problem with your DHCP -# setup you can enable this script and take a look at -# /tmp/dhclient-script.debug. - -# To enable this script set the following variable to "yes" -RUN="no" - -if [ "$RUN" = "yes" ]; then - echo $(date): entering ${0%/*}, dumping variables. \ - >> /tmp/dhclient-script.debug - - # loop over the 4 possible prefixes: (empty), cur_, new_, old_ - for prefix in '' 'cur_' 'new_' 'old_'; do - # loop over the DHCP variables passed to dhclient-script - for basevar in reason interface medium alias_ip_address \ - ip_address host_name network_number subnet_mask \ - broadcast_address routers static_routes \ - rfc3442_classless_static_routes \ - domain_name domain_search domain_name_servers \ - netbios_name_servers netbios_scope \ - ntp_servers \ - ip6_address ip6_prefix ip6_prefixlen \ - dhcp6_domain_search dhcp6_name_servers ; do - var="${prefix}${basevar}" - eval "content=\$var" - - # show only variables with values set - if [ -n "${content}" ]; then - echo "$var='${content}'" >> /tmp/dhclient-script.debug - fi - done - done - - echo '--------------------------' >> /tmp/dhclient-script.debug -fi diff --git a/dhcp/dhclient-enter-hooks.d/debug b/dhcp/dhclient-enter-hooks.d/debug new file mode 120000 index 0000000..ee34fdc --- /dev/null +++ b/dhcp/dhclient-enter-hooks.d/debug @@ -0,0 +1 @@ +../debug \ No newline at end of file diff --git a/dhcp/dhclient-exit-hooks.d/debug b/dhcp/dhclient-exit-hooks.d/debug deleted file mode 100644 index 5785a97..0000000 --- a/dhcp/dhclient-exit-hooks.d/debug +++ /dev/null @@ -1,39 +0,0 @@ -# -# The purpose of this script is just to show the variables that are -# available to all the scripts in this directory. All these scripts -# are called from /etc/dhcp3/dhclient-script, which exports all the -# variables shown before. If you want to debug a problem with your DHCP -# setup you can enable this script and take a look at -# /tmp/dhclient-script.debug. - -# To enable this script set the following variable to "yes" -RUN="no" - -if [ "$RUN" = "yes" ]; then - echo $(date): entering ${0%/*}, dumping variables. \ - >> /tmp/dhclient-script.debug - - # loop over the 4 possible prefixes: (empty), cur_, new_, old_ - for prefix in '' 'cur_' 'new_' 'old_'; do - # loop over the DHCP variables passed to dhclient-script - for basevar in reason interface medium alias_ip_address \ - ip_address host_name network_number subnet_mask \ - broadcast_address routers static_routes \ - rfc3442_classless_static_routes \ - domain_name domain_search domain_name_servers \ - netbios_name_servers netbios_scope \ - ntp_servers \ - ip6_address ip6_prefix ip6_prefixlen \ - dhcp6_domain_search dhcp6_name_servers ; do - var="${prefix}${basevar}" - eval "content=\$var" - - # show only variables with values set - if [ -n "${content}" ]; then - echo "$var='${content}'" >> /tmp/dhclient-script.debug - fi - done - done - - echo '--------------------------' >> /tmp/dhclient-script.debug -fi diff --git a/dhcp/dhclient-exit-hooks.d/debug b/dhcp/dhclient-exit-hooks.d/debug new file mode 120000 index 0000000..ee34fdc --- /dev/null +++ b/dhcp/dhclient-exit-hooks.d/debug @@ -0,0 +1 @@ +../debug \ No newline at end of file diff --git a/dhcp/dhclient-exit-hooks.d/rfc3442-classless-routes b/dhcp/dhclient-exit-hooks.d/rfc3442-classless-routes index 462fb46..1ef7b8a 100644 --- a/dhcp/dhclient-exit-hooks.d/rfc3442-classless-routes +++ b/dhcp/dhclient-exit-hooks.d/rfc3442-classless-routes @@ -20,26 +20,41 @@ if [ "$RUN" = "yes" ]; then case $net_length in 32|31|30|29|28|27|26|25) + if [ $# -lt 9 ]; then + return 1 + fi net_address="${2}.${3}.${4}.${5}" gateway="${6}.${7}.${8}.${9}" shift 9 ;; 24|23|22|21|20|19|18|17) + if [ $# -lt 8 ]; then + return 1 + fi net_address="${2}.${3}.${4}.0" gateway="${5}.${6}.${7}.${8}" shift 8 ;; 16|15|14|13|12|11|10|9) + if [ $# -lt 7 ]; then + return 1 + fi net_address="${2}.${3}.0.0" gateway="${4}.${5}.${6}.${7}" shift 7 ;; 8|7|6|5|4|3|2|1) + if [ $# -lt 6 ]; then + return 1 + fi net_address="${2}.0.0.0" gateway="${3}.${4}.${5}.${6}" shift 6 ;; 0) # default route + if [ $# -lt 5 ]; then + return 1 + fi net_address="0.0.0.0" gateway="${2}.${3}.${4}.${5}" shift 5 diff --git a/dhcp/dhclient-exit-hooks.d/timesyncd b/dhcp/dhclient-exit-hooks.d/timesyncd new file mode 100644 index 0000000..3cde992 --- /dev/null +++ b/dhcp/dhclient-exit-hooks.d/timesyncd @@ -0,0 +1,42 @@ +TIMESYNCD_CONF=/run/systemd/timesyncd.conf.d/01-dhclient.conf + +timesyncd_servers_setup_remove() { + if [ -e $TIMESYNCD_CONF ]; then + rm -f $TIMESYNCD_CONF + systemctl try-restart systemd-timesyncd.service || true + fi +} + +timesyncd_servers_setup_add() { + if [ ! -d /run/systemd/system ]; then + return + fi + + if [ -e $TIMESYNCD_CONF ] && [ "$new_ntp_servers" = "$old_ntp_servers" ]; then + return + fi + + if [ -z "$new_ntp_servers" ]; then + timesyncd_servers_setup_remove + return + fi + + mkdir -p $(dirname $TIMESYNCD_CONF) + cat < ${TIMESYNCD_CONF}.new +# NTP server entries received from DHCP server +[Time] +NTP=$new_ntp_servers +EOF + mv ${TIMESYNCD_CONF}.new ${TIMESYNCD_CONF} + systemctl try-restart systemd-timesyncd.service || true +} + + +case $reason in + BOUND|RENEW|REBIND|REBOOT) + timesyncd_servers_setup_add + ;; + EXPIRE|FAIL|RELEASE|STOP) + timesyncd_servers_setup_remove + ;; +esac diff --git a/dhcp/dhclient.conf b/dhcp/dhclient.conf index 431fafd..b85301b 100644 --- a/dhcp/dhclient.conf +++ b/dhcp/dhclient.conf @@ -1,5 +1,4 @@ -# Configuration file for /sbin/dhclient, which is included in Debian's -# dhcp3-client package. +# Configuration file for /sbin/dhclient. # # This is a sample configuration file for dhclient. See dhclient.conf's # man page for more information about the syntax of this file @@ -13,24 +12,24 @@ option rfc3442-classless-static-routes code 121 = array of unsigned integer 8; -#send host-name "andare.fugue.com"; send host-name = gethostname(); -#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; -#send dhcp-lease-time 3600; -#supersede domain-name "fugue.com home.vix.com"; -#prepend domain-name-servers 127.0.0.1; request subnet-mask, broadcast-address, time-offset, routers, domain-name, domain-name-servers, domain-search, host-name, - dhcp6.name-servers, dhcp6.domain-search, + dhcp6.name-servers, dhcp6.domain-search, dhcp6.fqdn, dhcp6.sntp-servers, netbios-name-servers, netbios-scope, interface-mtu, rfc3442-classless-static-routes, ntp-servers; + +#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; +#send dhcp-lease-time 3600; +#supersede domain-name "fugue.com home.vix.com"; +#prepend domain-name-servers 127.0.0.1; #require subnet-mask, domain-name-servers; #timeout 60; #retry 60; #reboot 10; #select-timeout 5; #initial-interval 2; -#script "/etc/dhcp3/dhclient-script"; +#script "/sbin/dhclient-script"; #media "-link0 -link1 -link2", "link0 link1"; #reject 192.33.137.209; diff --git a/etckeeper/commit.d/20store-metadata b/etckeeper/commit.d/20store-metadata new file mode 120000 index 0000000..5698d64 --- /dev/null +++ b/etckeeper/commit.d/20store-metadata @@ -0,0 +1 @@ +../pre-commit.d/30store-metadata \ No newline at end of file diff --git a/etckeeper/commit.d/50vcs-commit b/etckeeper/commit.d/50vcs-commit index 7c6173f..55f0db2 100755 --- a/etckeeper/commit.d/50vcs-commit +++ b/etckeeper/commit.d/50vcs-commit @@ -28,6 +28,7 @@ if [ -n "$dnsdomainname" ]; then hostname="$hostname.$dnsdomainname" fi +ORIG_USER=$USER USER= if [ -n "$SUDO_USER" ]; then USER="$SUDO_USER" @@ -43,7 +44,7 @@ if [ "$VCS" = git ] && [ -d .git ]; then if [ -n "$USER" ]; then # Use user.name and user.email from the gitconfig belonging # to the user who became root. - USER_HOME="$(perl -e 'print ((getpwnam(shift()))[7])' "$USER")" + USER_HOME="$(getent passwd "$USER" | cut -d: -f6)" if [ -n "$USER_HOME" ] && [ -e "$USER_HOME/.gitconfig" ]; then if [ -z "$GIT_AUTHOR_NAME" ]; then GIT_AUTHOR_NAME="$(git config -f "$USER_HOME/.gitconfig" user.name)" || true @@ -54,11 +55,23 @@ if [ "$VCS" = git ] && [ -d .git ]; then export GIT_AUTHOR_EMAIL fi fi - if [ -z "$GIT_COMMITTER_EMAIL" ]; then - GIT_COMMITER_EMAIL="$(git config --global user.email)" || true - export GIT_COMMITER_EMAIL + if [ -z "$GIT_AUTHOR_NAME" ] || [ -z "$GIT_AUTHOR_EMAIL" ]; then + if [ -n "$USER_HOME" ] && [ -e "$USER_HOME/.config/git/config" ]; then + if [ -z "$GIT_AUTHOR_NAME" ]; then + GIT_AUTHOR_NAME="$(git config -f "$USER_HOME/.config/git/config" user.name)" || true + export GIT_AUTHOR_NAME + fi + if [ -z "$GIT_AUTHOR_EMAIL" ]; then + GIT_AUTHOR_EMAIL="$(git config -f "$USER_HOME/.config/git/config" user.email)" || true + export GIT_AUTHOR_EMAIL + fi + fi fi + if [ -z "$GIT_COMMITTER_EMAIL" ]; then + GIT_COMMITTER_EMAIL="$(git config --global user.email)" || true + export GIT_COMMITTER_EMAIL + fi if [ -z "$GIT_AUTHOR_NAME" ]; then GIT_AUTHOR_NAME="$USER" export GIT_AUTHOR_NAME @@ -95,6 +108,8 @@ elif [ "$VCS" = bzr ] && [ -d .bzr ]; then if [ -z "$EMAIL" ] && [ -n "$USER" ]; then EMAIL="$USER <$USER@$hostname>" export EMAIL + else + bzr whoami >/dev/null 2>&1 || export EMAIL="$ORIG_USER <$ORIG_USER@$hostname>" fi if [ -n "$logfile" ]; then bzr commit $BZR_COMMIT_OPTIONS -F "$logfile" diff --git a/etckeeper/daily b/etckeeper/daily new file mode 100755 index 0000000..f98c6ad --- /dev/null +++ b/etckeeper/daily @@ -0,0 +1,17 @@ +#!/bin/sh +# Script that can be run daily to autocommit /etc changes. +set -e +if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then + # avoid autocommit if an install run is in progress + lockfile=/var/cache/etckeeper/packagelist.pre-install + if [ -e "$lockfile" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then + rm -f "$lockfile" # stale + fi + if [ ! -e "$lockfile" ]; then + AVOID_SPECIAL_FILE_WARNING=1 + export AVOID_SPECIAL_FILE_WARNING + if etckeeper unclean; then + etckeeper commit "daily autocommit" >/dev/null + fi + fi +fi diff --git a/etckeeper/etckeeper.conf b/etckeeper/etckeeper.conf index f988c10..0fb660b 100644 --- a/etckeeper/etckeeper.conf +++ b/etckeeper/etckeeper.conf @@ -16,12 +16,14 @@ BZR_COMMIT_OPTIONS="" # Options passed to darcs record when run by etckeeper. DARCS_COMMIT_OPTIONS="-a" -# Uncomment to avoid etckeeper committing existing changes -# to /etc automatically once per day. +# Etckeeper includes both a cron job and a systemd timer, which each +# can commit exiting changes to /etc automatically once per day. +# To enable the systemd timer, run: systemctl enable etckeeper.timer +# The cron job is enabled by default; to disable it, uncomment this next line. #AVOID_DAILY_AUTOCOMMITS=1 # Uncomment the following to avoid special file warning -# (the option is enabled automatically by cronjob regardless). +# (the option is enabled automatically for daily autocommits regardless). #AVOID_SPECIAL_FILE_WARNING=1 # Uncomment to avoid etckeeper committing existing changes to @@ -30,11 +32,11 @@ DARCS_COMMIT_OPTIONS="-a" #AVOID_COMMIT_BEFORE_INSTALL=1 # The high-level package manager that's being used. -# (apt, pacman-g2, yum, zypper etc) +# (apt, pacman, pacman-g2, yum, dnf, zypper etc) HIGHLEVEL_PACKAGE_MANAGER=apt # The low-level package manager that's being used. -# (dpkg, rpm, pacman, pacman-g2, etc) +# (dpkg, rpm, pacman, pacmatic, pacman-g2, etc) LOWLEVEL_PACKAGE_MANAGER=dpkg # To push each commit to a remote, put the name of the remote here. diff --git a/etckeeper/list-installed.d/50list-installed b/etckeeper/list-installed.d/50list-installed index f392027..129447f 100755 --- a/etckeeper/list-installed.d/50list-installed +++ b/etckeeper/list-installed.d/50list-installed @@ -1,12 +1,25 @@ #!/bin/sh -# Output to stdout a *sorted* list of all currently installed -# (or removed but still with config-files) packages, in the -# format "package version\n" (or something similar). -if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then - dpkg-query -W -f '${Status}\t${Package} ${Version}\n' | \ - egrep '(ok installed|ok config-files)' | cut -f2,3 -elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then - rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort -elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then - pacman -Q +if [ "$1" = fmt ]; then + # If the list format changes, change the fmt + if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then + echo 2 + else + echo "" + fi +else + # Output to stdout a *sorted* list of all currently installed + # (or removed but still with config-files) packages, in the + # format "package version\n" (or something similar). + if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then + dpkg-query -W -f '${Status}\t${Package} ${Version} ${Architecture}\n' | \ + egrep '(ok installed|ok config-files)' | cut -f2,3 + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then + rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then + pacman -Q + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacmatic ]; then + pacmatic -Q + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pkgng ]; then + pkg info -E "*" + fi fi diff --git a/etckeeper/post-install.d/50vcs-commit b/etckeeper/post-install.d/50vcs-commit index 36f3ee4..53138c8 100755 --- a/etckeeper/post-install.d/50vcs-commit +++ b/etckeeper/post-install.d/50vcs-commit @@ -7,7 +7,7 @@ if etckeeper unclean; then message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run" set +e - if [ -e $pl.pre-install ]; then + if [ -e $pl.pre-install ] && [ "$(cat $pl.fmt 2>/dev/null || true)" = "$(etckeeper list-installed fmt)" ]; then ( echo "$message" echo @@ -25,6 +25,4 @@ if etckeeper unclean; then fi fi -if [ -e $pl.pre-install ]; then - rm -f $pl.pre-install -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 f28d5ac..4ffbfd1 100755 --- a/etckeeper/pre-commit.d/20warn-problem-files +++ b/etckeeper/pre-commit.d/20warn-problem-files @@ -12,8 +12,8 @@ elif [ "$VCS" = hg ]; then special=$(find . ! -type d ! -type f ! -type l | exclude_internal) || true hardlinks=$(find . -type f ! -links 1 -exec hg status {} \; | exclude_internal ) || true elif [ "$VCS" = git ]; then - special=$(find . ! -type d ! -type f ! -type l -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true - hardlinks=$(find . -type f ! -links 1 -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true + special=$(find . ! -type d ! -type f ! -type l -exec git ls-files --exclude-standard --cached --others {} + | exclude_internal) || true + hardlinks=$(find . -type f ! -links 1 -exec git ls-files --exclude-standard --cached --others {} + | exclude_internal) || true else special="" fi diff --git a/etckeeper/pre-commit.d/30store-metadata b/etckeeper/pre-commit.d/30store-metadata index edec06b..2b77c8e 100755 --- a/etckeeper/pre-commit.d/30store-metadata +++ b/etckeeper/pre-commit.d/30store-metadata @@ -1,19 +1,6 @@ #!/bin/sh set -e -# Filters out UNKNOWN users and groups, prints a warning on stderr. -filter_unknown() { - CMD=$1 - while read line; do - # if the first n chars of $line equal "$CMD UNKNOWN "... - if [ "$(printf %.$((9+${#CMD}))s "$line")" = "$CMD UNKNOWN " ]; then - echo Bad "$2" for "$line" >&2 - else - echo "$line" - fi - done -} - filter_ignore() { case "$VCS" in darcs) ignorefile=.darcsignore ;; diff --git a/etckeeper/pre-install.d/10packagelist b/etckeeper/pre-install.d/10packagelist index e5fefa8..fbd4ac3 100755 --- a/etckeeper/pre-install.d/10packagelist +++ b/etckeeper/pre-install.d/10packagelist @@ -2,3 +2,4 @@ # This list will be later used when committing. mkdir -p /var/cache/etckeeper/ etckeeper list-installed > /var/cache/etckeeper/packagelist.pre-install +etckeeper list-installed fmt > /var/cache/etckeeper/packagelist.fmt diff --git a/etckeeper/uninit.d/50vcs-uninit b/etckeeper/uninit.d/50vcs-uninit index b330f1b..06317c5 100755 --- a/etckeeper/uninit.d/50vcs-uninit +++ b/etckeeper/uninit.d/50vcs-uninit @@ -21,9 +21,9 @@ if ! grep -q "$managed_by_etckeeper" "$file"; then exit 0 else realfile="$file" - if which tempfile >/dev/null 2>&1 || type -p tempfile >/dev/null 2>&1; then + if which tempfile >/dev/null 2>&1 || type tempfile >/dev/null 2>&1; then tempfile="tempfile" - elif which mktemp >/dev/null 2>&1 || type -p mktemp >/dev/null 2>&1; then + elif which mktemp >/dev/null 2>&1 || type mktemp >/dev/null 2>&1; then tempfile="mktemp" else echo "etckeeper warning: can't find tempfile or mktemp" >&2 diff --git a/etckeeper/update-ignore.d/01update-ignore b/etckeeper/update-ignore.d/01update-ignore index 528ff8a..7347287 100755 --- a/etckeeper/update-ignore.d/01update-ignore +++ b/etckeeper/update-ignore.d/01update-ignore @@ -93,7 +93,7 @@ writefile () { comment "new and old versions of conffiles, stored by apt/rpm" ignore "*.rpm*" nl - elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "pacman-g2" -o "$LOWLEVEL_PACKAGE_MANAGER" = "pacman" ]; then + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "pacman-g2" -o "$LOWLEVEL_PACKAGE_MANAGER" = "pacman" -o "$LOWLEVEL_PACKAGE_MANAGER" = "pacmatic" ]; then comment "new and old versions of conffiles, stored by pacman" ignore "*.pacnew" ignore "*.pacorig" @@ -171,9 +171,9 @@ if [ -e "$file" ]; then fi fi realfile="$file" - if which tempfile >/dev/null 2>&1 || type -p tempfile >/dev/null 2>&1; then + if which tempfile >/dev/null 2>&1 || type tempfile >/dev/null 2>&1; then tempfile="tempfile" - elif which mktemp >/dev/null 2>&1 || type -p mktemp >/dev/null 2>&1; then + elif which mktemp >/dev/null 2>&1 || type mktemp >/dev/null 2>&1; then tempfile="mktemp" else echo "etckeeper warning: can't find tempfile or mktemp" >&2 diff --git a/fail2ban/action.d/badips.conf b/fail2ban/action.d/badips.conf index 4a5c0f9..6f9513f 100644 --- a/fail2ban/action.d/badips.conf +++ b/fail2ban/action.d/badips.conf @@ -1,6 +1,6 @@ # Fail2ban reporting to badips.com # -# Note: This reports and IP only and does not actually ban traffic. Use +# Note: This reports an IP only and does not actually ban traffic. Use # another action in the same jail if you want bans to occur. # # Set the category to the appropriate value before use. @@ -10,7 +10,7 @@ [Definition] -actionban = curl --fail --user-agent "fail2ban v0.8.12" http://www.badips.com/add// +actionban = curl --fail --user-agent "" http://www.badips.com/add// [Init] diff --git a/fail2ban/action.d/badips.py b/fail2ban/action.d/badips.py new file mode 100644 index 0000000..4bc879a --- /dev/null +++ b/fail2ban/action.d/badips.py @@ -0,0 +1,377 @@ +# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: t -*- +# vi: set ft=python sts=4 ts=4 sw=4 noet : + +# This file is part of Fail2Ban. +# +# Fail2Ban 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. +# +# Fail2Ban 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 Fail2Ban; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +import sys +if sys.version_info < (2, 7): + raise ImportError("badips.py action requires Python >= 2.7") +import json +import threading +import logging +if sys.version_info >= (3, ): + from urllib.request import Request, urlopen + from urllib.parse import urlencode + from urllib.error import HTTPError +else: + from urllib2 import Request, urlopen, HTTPError + from urllib import urlencode + +from fail2ban.server.actions import ActionBase + + +class BadIPsAction(ActionBase): + """Fail2Ban action which reports bans to badips.com, and also + blacklist bad IPs listed on badips.com by using another action's + ban method. + + Parameters + ---------- + jail : Jail + The jail which the action belongs to. + name : str + Name assigned to the action. + category : str + Valid badips.com category for reporting failures. + score : int, optional + Minimum score for bad IPs. Default 3. + age : str, optional + Age of last report for bad IPs, per badips.com syntax. + Default "24h" (24 hours) + key : str, optional + Key issued by badips.com to report bans, for later retrieval + of personalised content. + banaction : str, optional + Name of banaction to use for blacklisting bad IPs. If `None`, + no blacklist of IPs will take place. + Default `None`. + bancategory : str, optional + Name of category to use for blacklisting, which can differ + from category used for reporting. e.g. may want to report + "postfix", but want to use whole "mail" category for blacklist. + Default `category`. + bankey : str, optional + Key issued by badips.com to blacklist IPs reported with the + associated key. + updateperiod : int, optional + Time in seconds between updating bad IPs blacklist. + Default 900 (15 minutes) + agent : str, optional + User agent transmitted to server. + Default `Fail2Ban/ver.` + + Raises + ------ + ValueError + If invalid `category`, `score`, `banaction` or `updateperiod`. + """ + + TIMEOUT = 10 + _badips = "http://www.badips.com" + def _Request(self, url, **argv): + return Request(url, headers={'User-Agent': self.agent}, **argv) + + def __init__(self, jail, name, category, score=3, age="24h", key=None, + banaction=None, bancategory=None, bankey=None, updateperiod=900, agent="Fail2Ban", + timeout=TIMEOUT): + super(BadIPsAction, self).__init__(jail, name) + + self.timeout = timeout + self.agent = agent + self.category = category + self.score = score + self.age = age + self.key = key + self.banaction = banaction + self.bancategory = bancategory or category + self.bankey = bankey + self.updateperiod = updateperiod + + self._bannedips = set() + # Used later for threading.Timer for updating badips + self._timer = None + + def getCategories(self, incParents=False): + """Get badips.com categories. + + Returns + ------- + set + Set of categories. + + Raises + ------ + HTTPError + Any issues with badips.com request. + ValueError + If badips.com response didn't contain necessary information + """ + try: + response = urlopen( + self._Request("/".join([self._badips, "get", "categories"])), timeout=self.timeout) + except HTTPError as response: + messages = json.loads(response.read().decode('utf-8')) + self._logSys.error( + "Failed to fetch categories. badips.com response: '%s'", + messages['err']) + raise + else: + response_json = json.loads(response.read().decode('utf-8')) + if not 'categories' in response_json: + err = "badips.com response lacked categories specification. Response was: %s" \ + % (response_json,) + self._logSys.error(err) + raise ValueError(err) + categories = response_json['categories'] + categories_names = set( + value['Name'] for value in categories) + if incParents: + categories_names.update(set( + value['Parent'] for value in categories + if "Parent" in value)) + return categories_names + + def getList(self, category, score, age, key=None): + """Get badips.com list of bad IPs. + + Parameters + ---------- + category : str + Valid badips.com category. + score : int + Minimum score for bad IPs. + age : str + Age of last report for bad IPs, per badips.com syntax. + key : str, optional + Key issued by badips.com to fetch IPs reported with the + associated key. + + Returns + ------- + set + Set of bad IPs. + + Raises + ------ + HTTPError + Any issues with badips.com request. + """ + try: + url = "?".join([ + "/".join([self._badips, "get", "list", category, str(score)]), + urlencode({'age': age})]) + if key: + url = "&".join([url, urlencode({'key': key})]) + response = urlopen(self._Request(url), timeout=self.timeout) + except HTTPError as response: + messages = json.loads(response.read().decode('utf-8')) + self._logSys.error( + "Failed to fetch bad IP list. badips.com response: '%s'", + messages['err']) + raise + else: + return set(response.read().decode('utf-8').split()) + + @property + def category(self): + """badips.com category for reporting IPs. + """ + return self._category + + @category.setter + def category(self, category): + if category not in self.getCategories(): + self._logSys.error("Category name '%s' not valid. " + "see badips.com for list of valid categories", + category) + raise ValueError("Invalid category: %s" % category) + self._category = category + + @property + def bancategory(self): + """badips.com bancategory for fetching IPs. + """ + return self._bancategory + + @bancategory.setter + def bancategory(self, bancategory): + if bancategory not in self.getCategories(incParents=True): + self._logSys.error("Category name '%s' not valid. " + "see badips.com for list of valid categories", + bancategory) + raise ValueError("Invalid bancategory: %s" % bancategory) + self._bancategory = bancategory + + @property + def score(self): + """badips.com minimum score for fetching IPs. + """ + return self._score + + @score.setter + def score(self, score): + score = int(score) + if 0 <= score <= 5: + self._score = score + else: + raise ValueError("Score must be 0-5") + + @property + def banaction(self): + """Jail action to use for banning/unbanning. + """ + return self._banaction + + @banaction.setter + def banaction(self, banaction): + if banaction is not None and banaction not in self._jail.actions: + self._logSys.error("Action name '%s' not in jail '%s'", + banaction, self._jail.name) + raise ValueError("Invalid banaction") + self._banaction = banaction + + @property + def updateperiod(self): + """Period in seconds between banned bad IPs will be updated. + """ + return self._updateperiod + + @updateperiod.setter + def updateperiod(self, updateperiod): + updateperiod = int(updateperiod) + if updateperiod > 0: + self._updateperiod = updateperiod + else: + raise ValueError("Update period must be integer greater than 0") + + def _banIPs(self, ips): + for ip in ips: + try: + self._jail.actions[self.banaction].ban({ + 'ip': ip, + 'failures': 0, + 'matches': "", + 'ipmatches': "", + 'ipjailmatches': "", + }) + except Exception as e: + self._logSys.error( + "Error banning IP %s for jail '%s' with action '%s': %s", + ip, self._jail.name, self.banaction, e, + exc_info=self._logSys.getEffectiveLevel()<=logging.DEBUG) + else: + self._bannedips.add(ip) + self._logSys.info( + "Banned IP %s for jail '%s' with action '%s'", + ip, self._jail.name, self.banaction) + + def _unbanIPs(self, ips): + for ip in ips: + try: + self._jail.actions[self.banaction].unban({ + 'ip': ip, + 'failures': 0, + 'matches': "", + 'ipmatches': "", + 'ipjailmatches': "", + }) + except Exception as e: + self._logSys.info( + "Error unbanning IP %s for jail '%s' with action '%s': %s", + ip, self._jail.name, self.banaction, e, + exc_info=self._logSys.getEffectiveLevel()<=logging.DEBUG) + else: + self._logSys.info( + "Unbanned IP %s for jail '%s' with action '%s'", + ip, self._jail.name, self.banaction) + finally: + self._bannedips.remove(ip) + + def start(self): + """If `banaction` set, blacklists bad IPs. + """ + if self.banaction is not None: + self.update() + + def update(self): + """If `banaction` set, updates blacklisted IPs. + + Queries badips.com for list of bad IPs, removing IPs from the + blacklist if no longer present, and adds new bad IPs to the + blacklist. + """ + if self.banaction is not None: + if self._timer: + self._timer.cancel() + self._timer = None + + try: + ips = self.getList( + self.bancategory, self.score, self.age, self.bankey) + # Remove old IPs no longer listed + self._unbanIPs(self._bannedips - ips) + # Add new IPs which are now listed + self._banIPs(ips - self._bannedips) + + self._logSys.info( + "Updated IPs for jail '%s'. Update again in %i seconds", + self._jail.name, self.updateperiod) + finally: + self._timer = threading.Timer(self.updateperiod, self.update) + self._timer.start() + + def stop(self): + """If `banaction` set, clears blacklisted IPs. + """ + if self.banaction is not None: + if self._timer: + self._timer.cancel() + self._timer = None + self._unbanIPs(self._bannedips.copy()) + + def ban(self, aInfo): + """Reports banned IP to badips.com. + + Parameters + ---------- + aInfo : dict + Dictionary which includes information in relation to + the ban. + + Raises + ------ + HTTPError + Any issues with badips.com request. + """ + try: + url = "/".join([self._badips, "add", self.category, aInfo['ip']]) + if self.key: + url = "?".join([url, urlencode({'key': self.key})]) + response = urlopen(self._Request(url), timeout=self.timeout) + except HTTPError as response: + messages = json.loads(response.read().decode('utf-8')) + self._logSys.error( + "Response from badips.com report: '%s'", + messages['err']) + raise + else: + messages = json.loads(response.read().decode('utf-8')) + self._logSys.info( + "Response from badips.com report: '%s'", + messages['suc']) + +Action = BadIPsAction diff --git a/fail2ban/action.d/blocklist_de.conf b/fail2ban/action.d/blocklist_de.conf index d4170ca..2f31d8b 100644 --- a/fail2ban/action.d/blocklist_de.conf +++ b/fail2ban/action.d/blocklist_de.conf @@ -7,13 +7,13 @@ # Action to report IP address to blocklist.de # Blocklist.de must be signed up to at www.blocklist.de # Once registered, one or more servers can be added. -# This action requires the server 'email address' and the assoicate apikey. +# This action requires the server 'email address' and the associated apikey. # # From blocklist.de: # www.blocklist.de is a free and voluntary service provided by a # Fraud/Abuse-specialist, whose servers are often attacked on SSH-, # Mail-Login-, FTP-, Webserver- and other services. -# The mission is to report all attacks to the abuse deparments of the +# The mission is to report all attacks to the abuse departments of the # infected PCs/servers to ensure that the responsible provider can inform # the customer about the infection and disable them # @@ -25,7 +25,7 @@ # * The recidive where the IP has been banned multiple times # * Where maxretry has been set quite high, beyond the normal user typing # password incorrectly. -# * For filters that have a low likelyhood of receiving human errors +# * For filters that have a low likelihood of receiving human errors # [Definition] @@ -54,7 +54,7 @@ actioncheck = # Tags: See jail.conf(5) man page # Values: CMD # -actionban = curl --fail --data-urlencode 'server=' --data 'apikey=' --data 'service=' --data 'ip=' --data-urlencode 'logs=' --data 'format=text' --user-agent "fail2ban v0.8.12" "https://www.blocklist.de/en/httpreports.html" +actionban = curl --fail --data-urlencode 'server=' --data 'apikey=' --data 'service=' --data 'ip=' --data-urlencode 'logs=' --data 'format=text' --user-agent "" "https://www.blocklist.de/en/httpreports.html" # Option: actionunban # Notes.: command executed when unbanning an IP. Take care that the diff --git a/fail2ban/action.d/bsd-ipfw.conf b/fail2ban/action.d/bsd-ipfw.conf index 1285361..8b0a51a 100644 --- a/fail2ban/action.d/bsd-ipfw.conf +++ b/fail2ban/action.d/bsd-ipfw.conf @@ -38,7 +38,7 @@ actioncheck = # Values: CMD # # requires an ipfw rule like "deny ip from table(1) to me" -actionban = ipfw table add +actionban = e=`ipfw table
add 2>&1`; x=$?; [ $x -eq 0 -o "$e" = 'ipfw: setsockopt(IP_FW_TABLE_XADD): File exists' ] || { echo "$e" 1>&2; exit $x; } # Option: actionunban @@ -47,7 +47,7 @@ actionban = ipfw table
add # Tags: See jail.conf(5) man page # Values: CMD # -actionunban = ipfw table
delete +actionunban = e=`ipfw table
delete 2>&1`; x=$?; [ $x -eq 0 -o "$e" = 'ipfw: setsockopt(IP_FW_TABLE_XDEL): No such process' ] || { echo "$e" 1>&2; exit $x; } [Init] # Option: table diff --git a/fail2ban/action.d/cloudflare.conf b/fail2ban/action.d/cloudflare.conf new file mode 100644 index 0000000..aa87163 --- /dev/null +++ b/fail2ban/action.d/cloudflare.conf @@ -0,0 +1,68 @@ +# +# Author: Mike Rushton +# +# IMPORTANT +# +# Please set jail.local's permission to 640 because it contains your CF API key. +# +# This action depends on curl. +# Referenced from http://www.normyee.net/blog/2012/02/02/adding-cloudflare-support-to-fail2ban by NORM YEE +# +# To get your CloudFlare API Key: https://www.cloudflare.com/a/account/my-account +# +# CloudFlare API error codes: https://www.cloudflare.com/docs/host-api.html#s4.2 + +[Definition] + +# Option: actionstart +# Notes.: command executed once at the start of Fail2Ban. +# Values: CMD +# +actionstart = + +# Option: actionstop +# Notes.: command executed once at the end of Fail2Ban +# Values: CMD +# +actionstop = + +# Option: actioncheck +# Notes.: command executed once before each actionban command +# Values: CMD +# +actioncheck = + +# Option: actionban +# Notes.: command executed when banning an IP. Take care that the +# command is executed with Fail2Ban user rights. +# Tags: IP address +# number of failures +#