From 3779252b918dea4531c231de03fb8afa9b583f32 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 21 Aug 2019 08:31:30 +0200 Subject: [PATCH] committing changes in /etc made by "apt purge mariadb-* mysql-*" Package changes: +bamfdaemon 0.5.3+18.04.20180207.2-0ubuntu1 amd64 -blender 2.79.b+dfsg0-6ubuntu1.19.04.1 amd64 -colord 1.4.3-4 amd64 +cups 2.2.10-4ubuntu2.1 amd64 +cups-bsd 2.2.10-4ubuntu2.1 amd64 +cups-client 2.2.10-4ubuntu2.1 amd64 +cups-common 2.2.10-4ubuntu2.1 all +cups-core-drivers 2.2.10-4ubuntu2.1 amd64 +cups-daemon 2.2.10-4ubuntu2.1 amd64 +cups-ipp-utils 2.2.10-4ubuntu2.1 amd64 +cups-ppdc 2.2.10-4ubuntu2.1 amd64 +cups-server-common 2.2.10-4ubuntu2.1 all +desktop-file-utils 0.23-4ubuntu1 amd64 +doc-base 0.10.8 all +fontconfig 2.13.1-2ubuntu2 amd64 +fonts-opensymbol 2:102.10+LibO6.2.6-0ubuntu0.19.04.1 all -forensics-all 3.6 all +gir1.2-lokdocview-0.1 1:6.2.6-0ubuntu0.19.04.1 amd64 -gnome-color-manager 3.32.0-1 amd64 -gnome-control-center 1:3.32.2-0ubuntu1.1 amd64 +gnome-icon-theme 3.12.0-3 all +gnome-menus 3.32.0-1ubuntu1 amd64 +hicolor-icon-theme 0.17-2 all -hplip 3.19.1+dfsg0-1 amd64 -hydra 8.8-1 amd64 +libc-bin 2.29-0ubuntu2 amd64 +libcups2 2.2.10-4ubuntu2.1 amd64 +libcups2 2.2.10-4ubuntu2.1 i386 +libcupsimage2 2.2.10-4ubuntu2.1 amd64 -libdbd-mysql-perl 4.050-2 amd64 -libgdal20 2.4.0+dfsg-1ubuntu3 amd64 +libgif7 5.1.4-3ubuntu0.1 amd64 -libhpmud0 3.19.1+dfsg0-1 amd64 +liblibreofficekitgtk 1:6.2.6-0ubuntu0.19.04.1 amd64 -libmysqlclient20 5.7.27-0ubuntu0.19.04.1 amd64 -libopencv-imgcodecs3.2 3.2.0+dfsg-6 amd64 -libopencv-videoio3.2 3.2.0+dfsg-6 amd64 -libopenimageio1.7 1.7.17~dfsg0-1ubuntu2 amd64 -libopenimageio2.0 2.0.5~dfsg0-1ubuntu1 amd64 +libprocps7 2:3.3.15-2ubuntu2.1 amd64 +libreoffice-avmedia-backend-gstreamer 1:6.2.6-0ubuntu0.19.04.1 amd64 +libreoffice-base-core 1:6.2.6-0ubuntu0.19.04.1 amd64 +libreoffice-calc 1:6.2.6-0ubuntu0.19.04.1 amd64 +libreoffice-common 1:6.2.6-0ubuntu0.19.04.1 all +libreoffice-core 1:6.2.6-0ubuntu0.19.04.1 amd64 +libreoffice-draw 1:6.2.6-0ubuntu0.19.04.1 amd64 +libreoffice-gnome 1:6.2.6-0ubuntu0.19.04.1 amd64 +libreoffice-gtk 1:6.2.6-0ubuntu0.19.04.1 all +libreoffice-gtk2 1:6.2.6-0ubuntu0.19.04.1 amd64 +libreoffice-gtk3 1:6.2.6-0ubuntu0.19.04.1 amd64 +libreoffice-help-de 1:6.2.6-0ubuntu0.19.04.1 all +libreoffice-help-en-us 1:6.2.6-0ubuntu0.19.04.1 all +libreoffice-impress 1:6.2.6-0ubuntu0.19.04.1 amd64 +libreoffice-l10n-de 1:6.2.6-0ubuntu0.19.04.1 all +libreoffice-math 1:6.2.6-0ubuntu0.19.04.1 amd64 +libreoffice-ogltrans 1:6.2.6-0ubuntu0.19.04.1 all +libreoffice-pdfimport 1:6.2.6-0ubuntu0.19.04.1 all +libreoffice-style-breeze 1:6.2.6-0ubuntu0.19.04.1 all +libreoffice-style-colibre 1:6.2.6-0ubuntu0.19.04.1 all +libreoffice-style-elementary 1:6.2.6-0ubuntu0.19.04.1 all +libreoffice-style-galaxy 1:6.2.6-0ubuntu0.19.04.1 all +libreoffice-style-tango 1:6.2.6-0ubuntu0.19.04.1 all +libreoffice-writer 1:6.2.6-0ubuntu0.19.04.1 amd64 +libreofficekit-data 1:6.2.6-0ubuntu0.19.04.1 all -libsane 1.0.27-3.2ubuntu1 amd64 -libsane-hpaio 3.19.1+dfsg0-1 amd64 -libsane1 1.0.27-3.2ubuntu1 amd64 -libsnmp30 5.7.3+dfsg-5ubuntu1 amd64 +man-db 2.8.5-2 amd64 -mariadb-client-10.1 1:10.1.40-0ubuntu0.18.04.1 amd64 -mariadb-client-10.3 1:10.3.17-0ubuntu0.19.04.1 amd64 -mariadb-client-core-10.3 1:10.3.17-0ubuntu0.19.04.1 amd64 -mariadb-common 1:10.3.17-0ubuntu0.19.04.1 all -mariadb-server-10.1 1:10.1.40-0ubuntu0.18.04.1 amd64 -mariadb-server-10.3 1:10.3.16+maria~bionic amd64 -mariadb-server-core-10.3 1:10.3.16+maria~bionic amd64 +menu 2.1.47ubuntu3 amd64 +mime-support 3.60ubuntu1 all -mysql-common 1:10.3.16+maria~bionic all -patator 0.7-2 all -printer-driver-hpcups 3.19.1+dfsg0-1 amd64 +procps 2:3.3.15-2ubuntu2.1 amd64 -python3-mysqldb 1.3.10-2 amd64 +python3-uno 1:6.2.6-0ubuntu0.19.04.1 amd64 -sane-utils 1.0.27-3.2ubuntu1 amd64 +shared-mime-info 1.10-1 amd64 -simple-scan 3.32.0-0ubuntu1 amd64 +systemd 240-6ubuntu5.3 amd64 -ubuntu-desktop 1.431.1 amd64 -ubuntu-desktop-minimal 1.431.1 amd64 +ufw 0.36-1ubuntu1 all +uno-libs3 6.2.6-0ubuntu0.19.04.1 amd64 +ure 6.2.6-0ubuntu0.19.04.1 amd64 +ureadahead 0.100.0-21 amd64 --- .etckeeper | 32 +-- apparmor.d/usr.sbin.mysqld | 15 -- cups/printers.conf.O | 20 -- dbus-1/system.d/com.hp.hplip.conf | 27 --- default/mysql | 23 --- default/saned | 4 - hp/hplip.conf | 50 ----- init.d/mysql | 193 ------------------ init.d/saned | 90 -------- insserv.conf.d/mariadb | 1 - .../ignore.d.paranoid/mariadb-server-10_1 | 9 - .../ignore.d.paranoid/mariadb-server-10_3 | 9 - logcheck/ignore.d.server/mariadb-server-10_1 | 32 --- logcheck/ignore.d.server/mariadb-server-10_3 | 32 --- .../ignore.d.workstation/mariadb-server-10_1 | 32 --- .../ignore.d.workstation/mariadb-server-10_3 | 32 --- logrotate.d/mysql-server | 20 -- mailcap | 2 - mysql/conf.d/mysql.cnf | 1 - mysql/conf.d/mysqld_safe_syslog.cnf | 3 - mysql/conf.d/mysqldump.cnf | 4 - mysql/debian-start | 42 ---- mysql/mariadb.cnf | 19 -- mysql/mariadb.conf.d/50-client.cnf | 25 --- mysql/mariadb.conf.d/50-mysql-clients.cnf | 24 --- mysql/mariadb.conf.d/50-mysqld_safe.cnf | 30 --- mysql/mariadb.conf.d/50-server.cnf | 134 ------------ mysql/my.cnf.fallback | 23 --- printcap | 1 + rc0.d/K02mysql | 1 - rc1.d/K01saned | 1 - rc1.d/K02mysql | 1 - rc2.d/S03mysql | 1 - rc2.d/{S04postfix => S03postfix} | 0 rc2.d/S06saned | 1 - rc3.d/S03mysql | 1 - rc3.d/{S04postfix => S03postfix} | 0 rc3.d/S06saned | 1 - rc4.d/S03mysql | 1 - rc4.d/{S04postfix => S03postfix} | 0 rc4.d/S06saned | 1 - rc5.d/S03mysql | 1 - rc5.d/{S04postfix => S03postfix} | 0 rc5.d/S06saned | 1 - rc6.d/K02mysql | 1 - sane.d/dll.d/hplip | 4 - sane.d/saned.conf | 31 --- .../multi-user.target.wants/mariadb.service | 1 - systemd/system/mysql.service | 1 - systemd/system/mysqld.service | 1 - 50 files changed, 2 insertions(+), 977 deletions(-) delete mode 100644 apparmor.d/usr.sbin.mysqld delete mode 100644 dbus-1/system.d/com.hp.hplip.conf delete mode 100644 default/mysql delete mode 100644 default/saned delete mode 100644 hp/hplip.conf delete mode 100755 init.d/mysql delete mode 100755 init.d/saned delete mode 100644 insserv.conf.d/mariadb delete mode 100644 logcheck/ignore.d.paranoid/mariadb-server-10_1 delete mode 100644 logcheck/ignore.d.paranoid/mariadb-server-10_3 delete mode 100644 logcheck/ignore.d.server/mariadb-server-10_1 delete mode 100644 logcheck/ignore.d.server/mariadb-server-10_3 delete mode 100644 logcheck/ignore.d.workstation/mariadb-server-10_1 delete mode 100644 logcheck/ignore.d.workstation/mariadb-server-10_3 delete mode 100644 logrotate.d/mysql-server delete mode 100644 mysql/conf.d/mysql.cnf delete mode 100644 mysql/conf.d/mysqld_safe_syslog.cnf delete mode 100644 mysql/conf.d/mysqldump.cnf delete mode 100755 mysql/debian-start delete mode 100644 mysql/mariadb.cnf delete mode 100644 mysql/mariadb.conf.d/50-client.cnf delete mode 100644 mysql/mariadb.conf.d/50-mysql-clients.cnf delete mode 100644 mysql/mariadb.conf.d/50-mysqld_safe.cnf delete mode 100644 mysql/mariadb.conf.d/50-server.cnf delete mode 100644 mysql/my.cnf.fallback create mode 120000 printcap delete mode 120000 rc0.d/K02mysql delete mode 120000 rc1.d/K01saned delete mode 120000 rc1.d/K02mysql delete mode 120000 rc2.d/S03mysql rename rc2.d/{S04postfix => S03postfix} (100%) delete mode 120000 rc2.d/S06saned delete mode 120000 rc3.d/S03mysql rename rc3.d/{S04postfix => S03postfix} (100%) delete mode 120000 rc3.d/S06saned delete mode 120000 rc4.d/S03mysql rename rc4.d/{S04postfix => S03postfix} (100%) delete mode 120000 rc4.d/S06saned delete mode 120000 rc5.d/S03mysql rename rc5.d/{S04postfix => S03postfix} (100%) delete mode 120000 rc5.d/S06saned delete mode 120000 rc6.d/K02mysql delete mode 100644 sane.d/dll.d/hplip delete mode 100644 sane.d/saned.conf delete mode 120000 systemd/system/multi-user.target.wants/mariadb.service delete mode 120000 systemd/system/mysql.service delete mode 120000 systemd/system/mysqld.service diff --git a/.etckeeper b/.etckeeper index 89b924a..cf2902b 100755 --- a/.etckeeper +++ b/.etckeeper @@ -67,6 +67,7 @@ mkdir -p './ppp/resolv' mkdir -p './psad/archive' mkdir -p './psad/snort_rules' mkdir -p './request-key.d' +mkdir -p './sane.d/dll.d' mkdir -p './security/namespace.d' mkdir -p './smartmontools/smartd_warning.d' mkdir -p './systemd/network' @@ -506,7 +507,6 @@ maybe chmod 0644 'apparmor.d/usr.lib.telepathy' maybe chmod 0644 'apparmor.d/usr.sbin.cups-browsed' maybe chmod 0644 'apparmor.d/usr.sbin.cupsd' maybe chmod 0644 'apparmor.d/usr.sbin.ippusbxd' -maybe chmod 0644 'apparmor.d/usr.sbin.mysqld' maybe chmod 0644 'apparmor.d/usr.sbin.ntpd' maybe chmod 0644 'apparmor.d/usr.sbin.rsyslogd' maybe chmod 0644 'apparmor.d/usr.sbin.tcpdump' @@ -1279,7 +1279,6 @@ maybe chmod 0644 'dbus-1/system.d/Mountall.Server.conf' maybe chmod 0644 'dbus-1/system.d/Upstart.conf' maybe chmod 0644 'dbus-1/system.d/avahi-dbus.conf' maybe chmod 0644 'dbus-1/system.d/bluetooth.conf' -maybe chmod 0644 'dbus-1/system.d/com.hp.hplip.conf' maybe chmod 0644 'dbus-1/system.d/com.redhat.NewPrinterNotification.conf' maybe chmod 0644 'dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf' maybe chmod 0644 'dbus-1/system.d/com.ubuntu.LanguageSelector.conf' @@ -1355,7 +1354,6 @@ maybe chmod 0644 'default/kerneloops' maybe chmod 0664 'default/keyboard' maybe chmod 0644 'default/locale' maybe chmod 0644 'default/motd-news' -maybe chmod 0644 'default/mysql' maybe chmod 0644 'default/networkd-dispatcher' maybe chmod 0644 'default/networking' maybe chmod 0644 'default/nss' @@ -1368,7 +1366,6 @@ maybe chmod 0644 'default/rcS' maybe chmod 0644 'default/rkhunter' maybe chmod 0644 'default/rsync' maybe chmod 0644 'default/rsyslog' -maybe chmod 0644 'default/saned' maybe chmod 0644 'default/smartmontools' maybe chmod 0644 'default/ssh' maybe chmod 0644 'default/sysstat' @@ -1735,8 +1732,6 @@ maybe chmod 0644 'hosts.allow' maybe chmod 0644 'hosts.deny' maybe chmod 0755 'hotplug' maybe chmod 0755 'hotplug/usb' -maybe chmod 0755 'hp' -maybe chmod 0644 'hp/hplip.conf' maybe chmod 0755 'icedtea-web' maybe chmod 0644 'icedtea-web/javaws.policy' maybe chmod 0755 'ifplugd' @@ -1795,7 +1790,6 @@ maybe chmod 0755 'init.d/mountdevsubfs.sh' maybe chmod 0755 'init.d/mountkernfs.sh' maybe chmod 0755 'init.d/mountnfs-bootclean.sh' maybe chmod 0755 'init.d/mountnfs.sh' -maybe chmod 0755 'init.d/mysql' maybe chmod 0755 'init.d/network-manager' maybe chmod 0755 'init.d/networking' maybe chmod 0755 'init.d/ntp' @@ -1814,7 +1808,6 @@ maybe chmod 0755 'init.d/reboot' maybe chmod 0755 'init.d/resolvconf' maybe chmod 0755 'init.d/rsync' maybe chmod 0755 'init.d/rsyslog' -maybe chmod 0755 'init.d/saned' maybe chmod 0755 'init.d/screen-cleanup' maybe chmod 0755 'init.d/sendsigs' maybe chmod 0755 'init.d/single' @@ -1916,7 +1909,6 @@ maybe chmod 0755 'insserv' maybe chmod 0644 'insserv.conf' maybe chmod 0755 'insserv.conf.d' maybe chmod 0644 'insserv.conf.d/gdm3' -maybe chmod 0644 'insserv.conf.d/mariadb' maybe chmod 0644 'insserv.conf.d/postfix' maybe chmod 0755 'insserv/overrides' maybe chmod 0755 'iproute2' @@ -2065,19 +2057,12 @@ maybe chmod 0644 'locale.gen' maybe chmod 0755 'logcheck' maybe chmod 0755 'logcheck/ignore.d.paranoid' maybe chmod 0644 'logcheck/ignore.d.paranoid/cracklib-runtime' -maybe chmod 0644 'logcheck/ignore.d.paranoid/mariadb-server-10_1' -maybe chmod 0644 'logcheck/ignore.d.paranoid/mariadb-server-10_3' maybe chmod 0755 'logcheck/ignore.d.server' maybe chmod 0644 'logcheck/ignore.d.server/gpg-agent' maybe chmod 0644 'logcheck/ignore.d.server/libsasl2-modules' -maybe chmod 0644 'logcheck/ignore.d.server/mariadb-server-10_1' -maybe chmod 0644 'logcheck/ignore.d.server/mariadb-server-10_3' maybe chmod 0644 'logcheck/ignore.d.server/ntpdate' maybe chmod 0644 'logcheck/ignore.d.server/rkhunter' maybe chmod 0644 'logcheck/ignore.d.server/rsyslog' -maybe chmod 0755 'logcheck/ignore.d.workstation' -maybe chmod 0644 'logcheck/ignore.d.workstation/mariadb-server-10_1' -maybe chmod 0644 'logcheck/ignore.d.workstation/mariadb-server-10_3' maybe chmod 0644 'login.defs' maybe chmod 0644 'logrotate.conf' maybe chmod 0755 'logrotate.d' @@ -2091,7 +2076,6 @@ maybe chmod 0644 'logrotate.d/dpkg' maybe chmod 0644 'logrotate.d/iptraf-ng' maybe chmod 0644 'logrotate.d/lightdm' maybe chmod 0644 'logrotate.d/mongodb-server' -maybe chmod 0644 'logrotate.d/mysql-server' maybe chmod 0644 'logrotate.d/pm-utils' maybe chmod 0644 'logrotate.d/ppp' maybe chmod 0644 'logrotate.d/rkhunter' @@ -2183,19 +2167,7 @@ maybe chmod 0644 'mpv/encoding-profiles.conf' maybe chmod 0644 'mpv/mpv.conf' maybe chmod 0644 'mtools.conf' maybe chmod 0755 'mysql' -maybe chmod 0755 'mysql/conf.d' -maybe chmod 0644 'mysql/conf.d/mysql.cnf' -maybe chmod 0644 'mysql/conf.d/mysqld_safe_syslog.cnf' -maybe chmod 0644 'mysql/conf.d/mysqldump.cnf' -maybe chmod 0755 'mysql/debian-start' maybe chmod 0600 'mysql/debian.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/mariadb.conf.d/50-mysqld_safe.cnf' -maybe chmod 0644 'mysql/mariadb.conf.d/50-server.cnf' -maybe chmod 0644 'mysql/my.cnf.fallback' maybe chmod 0644 'nanorc' maybe chmod 0755 'netplan' maybe chmod 0644 'netscsid.conf' @@ -2616,7 +2588,6 @@ maybe chmod 0644 'sane.d/dc25.conf' maybe chmod 0644 'sane.d/dell1600n_net.conf' maybe chmod 0644 'sane.d/dll.conf' maybe chmod 0755 'sane.d/dll.d' -maybe chmod 0644 'sane.d/dll.d/hplip' maybe chmod 0644 'sane.d/dmc.conf' maybe chmod 0644 'sane.d/epjitsu.conf' maybe chmod 0644 'sane.d/epson.conf' @@ -2658,7 +2629,6 @@ maybe chmod 0644 'sane.d/qcam.conf' maybe chmod 0644 'sane.d/ricoh.conf' maybe chmod 0644 'sane.d/rts8891.conf' maybe chmod 0644 'sane.d/s9036.conf' -maybe chmod 0644 'sane.d/saned.conf' maybe chmod 0644 'sane.d/sceptre.conf' maybe chmod 0644 'sane.d/sharp.conf' maybe chmod 0644 'sane.d/sm3840.conf' diff --git a/apparmor.d/usr.sbin.mysqld b/apparmor.d/usr.sbin.mysqld deleted file mode 100644 index b1f229b..0000000 --- a/apparmor.d/usr.sbin.mysqld +++ /dev/null @@ -1,15 +0,0 @@ -# This file is intentionally empty to disable apparmor by default for newer -# versions of MariaDB, while providing seamless upgrade from older versions -# and from mysql, where apparmor is used. -# -# By default, we do not want to have any apparmor profile for the MariaDB -# server. It does not provide much useful functionality/security, and causes -# several problems for users who often are not even aware that apparmor -# exists and runs on their system. -# -# Users can modify and maintain their own profile, and in this case it will -# be used. -# -# When upgrading from previous version, users who modified the profile -# will be prompted to keep or discard it, while for default installs -# we will automatically disable the profile. diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 4ceee92..9a1c5a5 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -91,26 +91,6 @@ KLimit 0 OpPolicy default ErrorPolicy retry-job - -UUID urn:uuid:3f1529ea-13a7-35a4-5806-dd42aa95c6cb -Info HP LaserJet M806 [17B98C] -Location -MakeModel LaserJet M806 - IPP Everywhere -DeviceURI ipps://k2-hp2.local:443/ipp/print -State Idle -StateTime 1566279833 -ConfigTime 1566279959 -Type 12372 -Accepting Yes -Shared No -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 -OpPolicy default -ErrorPolicy retry-job -Option cups-browsed true - UUID urn:uuid:26ed6b4a-09ef-38ff-72ee-93e3df6219a5 Info ISUDRUCK0309_apmgoppold diff --git a/dbus-1/system.d/com.hp.hplip.conf b/dbus-1/system.d/com.hp.hplip.conf deleted file mode 100644 index cf88a07..0000000 --- a/dbus-1/system.d/com.hp.hplip.conf +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/default/mysql b/default/mysql deleted file mode 100644 index 146c5a8..0000000 --- a/default/mysql +++ /dev/null @@ -1,23 +0,0 @@ -# -# NOTE: This file is read only by the traditional SysV init script. -# Debian 9 and Ubuntu 17.04 onwards do not normally read this file as they use -# systemd by default. -# -# For similar behaviour, systemd users should override ExecStart by dropping -# files into /etc/systemd/system/mariadb.service.d/ -# -# See also: -# https://wiki.debian.org/Teams/pkg-systemd/Packaging#overriding_options_and_.2Fetc.2Fdefault_handling -# https://mariadb.com/kb/en/mariadb/systemd/ -# -# Note also that MariaDB systemd does _not_ utilize mysqld_safe nor debian-start. - - -# The delay in seconds the init script waits for the server to be up and running after having started "mysqld_safe" to run the "/etc/mysql/debian-start" script. -# If the server is still not responding after the delay, the script won't be executed and an error will be thrown on the syslog. -# Default: 30 -#MYSQLD_STARTUP_TIMEOUT=30 - -# The email recipient(s) of the output of the check for crashed and improperly closed MyISAM and Aria tables done at each server start by the "/etc/mysql/debian-start" script. -# Default: root -#MYCHECK_RCPT="root" diff --git a/default/saned b/default/saned deleted file mode 100644 index 691e5a5..0000000 --- a/default/saned +++ /dev/null @@ -1,4 +0,0 @@ -# Defaults for the saned initscript, from sane-utils - -# Set to the user saned should run as -RUN_AS_USER=saned diff --git a/hp/hplip.conf b/hp/hplip.conf deleted file mode 100644 index cd85609..0000000 --- a/hp/hplip.conf +++ /dev/null @@ -1,50 +0,0 @@ -# hplip.conf. Generated from hplip.conf.in by configure. - -[hplip] -version=3.19.1 - -[dirs] -home=/usr/share/hplip -run=/var/run -ppd=/usr/share/ppd/hplip/HP -ppdbase=/usr/share/ppd/hplip -doc=/usr/share/doc/hplip -html=/usr/share/doc/hplip-doc -icon=no -cupsbackend=/usr/lib/cups/backend -cupsfilter=/usr/lib/cups/filter -drv=/usr/share/cups/drv -bin=/usr/bin -apparmor=/etc/apparmor.d -# Following values are determined at configure time and cannot be changed. -[configure] -network-build=yes -libusb01-build=no -pp-build=no -gui-build=yes -scanner-build=yes -fax-build=yes -dbus-build=yes -cups11-build=no -doc-build=yes -shadow-build=no -hpijs-install=yes -foomatic-drv-install=yes -foomatic-ppd-install=no -foomatic-rip-hplip-install=no -hpcups-install=yes -cups-drv-install=yes -cups-ppd-install=no -internal-tag=3.19.1 -restricted-build=no -ui-toolkit=qt5 -qt3=no -qt4=no -qt5=yes -policy-kit=yes -lite-build=no -udev_sysfs_rules=no -hpcups-only-build=no -hpijs-only-build=no -apparmor_build=no -class-driver=no diff --git a/init.d/mysql b/init.d/mysql deleted file mode 100755 index 35a52d5..0000000 --- a/init.d/mysql +++ /dev/null @@ -1,193 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: mysql -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: $network $named $time -# Should-Stop: $network $named $time -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start and stop the mysql database server daemon -# Description: Controls the main MariaDB database server daemon "mysqld" -# and its wrapper script "mysqld_safe". -### END INIT INFO -# -set -e -set -u -${DEBIAN_SCRIPT_DEBUG:+ set -v -x} - -test -x /usr/sbin/mysqld || exit 0 - -. /lib/lsb/init-functions - -SELF=$(cd $(dirname $0); pwd -P)/$(basename $0) - -MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" - -# priority can be overridden and "-s" adds output to stderr -ERR_LOGGER="logger -p daemon.err -t /etc/init.d/mysql -i" - -if [ -f /etc/default/mysql ]; then - . /etc/default/mysql -fi - -# Safeguard (relative paths, core dumps..) -cd / -umask 077 - -# mysqladmin likes to read /root/.my.cnf. This is usually not what I want -# as many admins e.g. only store a password without a username there and -# so break my scripts. -export HOME=/etc/mysql/ - -## Fetch a particular option from mysql's invocation. -# -# Usage: void mysqld_get_param option -mysqld_get_param() { - /usr/sbin/mysqld --print-defaults \ - | tr " " "\n" \ - | grep -- "--$1" \ - | tail -n 1 \ - | cut -d= -f2 -} - -## Do some sanity checks before even trying to start mysqld. -sanity_checks() { - # check for config file - if [ ! -r /etc/mysql/my.cnf ]; then - log_warning_msg "$0: WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" - echo "WARNING: /etc/mysql/my.cnf cannot be read. See README.Debian.gz" | $ERR_LOGGER - fi - - # check for diskspace shortage - datadir=`mysqld_get_param datadir` - if LC_ALL=C BLOCKSIZE= df --portability $datadir/. | tail -n 1 | awk '{ exit ($4>4096) }'; then - log_failure_msg "$0: ERROR: The partition with $datadir is too full!" - echo "ERROR: The partition with $datadir is too full!" | $ERR_LOGGER - exit 1 - fi -} - -## Checks if there is a server running and if so if it is accessible. -# -# check_alive insists on a pingable server -# check_dead also fails if there is a lost mysqld in the process list -# -# Usage: boolean mysqld_status [check_alive|check_dead] [warn|nowarn] -mysqld_status () { - ping_output=`$MYADMIN ping 2>&1`; ping_alive=$(( ! $? )) - - ps_alive=0 - pidfile=`mysqld_get_param pid-file` - if [ -f "$pidfile" ] && ps `cat $pidfile` >/dev/null 2>&1; then ps_alive=1; fi - - if [ "$1" = "check_alive" -a $ping_alive = 1 ] || - [ "$1" = "check_dead" -a $ping_alive = 0 -a $ps_alive = 0 ]; then - return 0 # EXIT_SUCCESS - else - if [ "$2" = "warn" ]; then - echo -e "$ps_alive processes alive and '$MYADMIN ping' resulted in\n$ping_output\n" | $ERR_LOGGER -p daemon.debug - fi - return 1 # EXIT_FAILURE - fi -} - -# -# main() -# - -case "${1:-''}" in - - 'start') - sanity_checks; - # Start daemon - log_daemon_msg "Starting MariaDB database server" "mysqld" - if mysqld_status check_alive nowarn; then - log_progress_msg "already running" - log_end_msg 0 - else - # Could be removed during boot - test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld - - # Start MariaDB! - /usr/bin/mysqld_safe "${@:2}" 2>&1 >/dev/null | $ERR_LOGGER & - - for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do - sleep 1 - if mysqld_status check_alive nowarn ; then break; fi - log_progress_msg "." - done - if mysqld_status check_alive warn; then - log_end_msg 0 - # Now start mysqlcheck or whatever the admin wants. - output=$(/etc/mysql/debian-start) - if [ -n "$output" ]; then - log_action_msg "$output" - fi - else - log_end_msg 1 - log_failure_msg "Please take a look at the syslog" - fi - fi - ;; - - 'stop') - # * As a passwordless mysqladmin (e.g. via ~/.my.cnf) must be possible - # at least for cron, we can rely on it here, too. (although we have - # to specify it explicit as e.g. sudo environments points to the normal - # users home and not /root) - log_daemon_msg "Stopping MariaDB database server" "mysqld" - if ! mysqld_status check_dead nowarn; then - set +e - shutdown_out=`$MYADMIN shutdown 2>&1`; r=$? - set -e - if [ "$r" -ne 0 ]; then - log_end_msg 1 - [ "$VERBOSE" != "no" ] && log_failure_msg "Error: $shutdown_out" - log_daemon_msg "Killing MariaDB database server by signal" "mysqld" - killall -15 mysqld - server_down= - for i in `seq 1 600`; do - sleep 1 - if mysqld_status check_dead nowarn; then server_down=1; break; fi - done - if test -z "$server_down"; then killall -9 mysqld; fi - fi - fi - - if ! mysqld_status check_dead warn; then - log_end_msg 1 - log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.3/README.Debian.gz!" - exit -1 - else - log_end_msg 0 - fi - ;; - - 'restart') - set +e; $SELF stop; set -e - shift - $SELF start "${@}" - ;; - - 'reload'|'force-reload') - log_daemon_msg "Reloading MariaDB database server" "mysqld" - $MYADMIN reload - log_end_msg 0 - ;; - - 'status') - if mysqld_status check_alive nowarn; then - log_action_msg "$($MYADMIN version)" - else - log_action_msg "MariaDB is stopped." - exit 3 - fi - ;; - - *) - echo "Usage: $SELF start|stop|restart|reload|force-reload|status" - exit 1 - ;; -esac diff --git a/init.d/saned b/init.d/saned deleted file mode 100755 index e629105..0000000 --- a/init.d/saned +++ /dev/null @@ -1,90 +0,0 @@ -#! /bin/sh -# -### BEGIN INIT INFO -# Provides: saned -# Required-Start: $syslog $local_fs $remote_fs -# Required-Stop: $syslog $local_fs $remote_fs -# Should-Start: dbus avahi-daemon -# Should-Stop: dbus avahi-daemon -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: SANE network scanner server -# Description: saned makes local scanners available over the -# network. -### END INIT INFO - -. /lib/lsb/init-functions - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/saned -NAME=saned -DESC="SANE network scanner server" - -test -x $DAEMON || exit 0 - -RUN=no -RUN_AS_USER=saned - -# Get lsb functions -. /lib/lsb/init-functions - -# Include saned defaults if available -if [ -f /etc/default/saned ] ; then - . /etc/default/saned -fi - -DAEMON_OPTS="-a $RUN_AS_USER" - -set -e - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ - --exec $DAEMON -- $DAEMON_OPTS - log_end_msg $? - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - start-stop-daemon --stop --oknodo --quiet --pidfile /var/run/$NAME.pid \ - --retry 10 --exec $DAEMON - log_end_msg $? - ;; - force-reload) - # check whether $DAEMON is running. If so, restart - start-stop-daemon --stop --test --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON \ - && $0 restart \ - || exit 0 - ;; - restart) - log_daemon_msg "Restarting $DESC" "$NAME" - $0 stop - $0 start - ;; - status) - if [ -s /var/run/$NAME.pid ]; then - RUNNING=$(cat /var/run/$NAME.pid) - if [ -d /proc/$RUNNING ]; then - if [ $(readlink /proc/$RUNNING/exe) = $DAEMON ]; then - log_success_msg "$NAME is running" - exit 0 - fi - fi - - # No such PID, or executables don't match - log_failure_msg "$NAME is not running, but pidfile existed" - rm /var/run/$NAME.pid - exit 1 - else - rm -f /var/run/$NAME.pid - log_failure_msg "$NAME not running" - exit 1 - fi - ;; - *) - N=/etc/init.d/$NAME - log_failure_msg "Usage: $N {start|stop|restart|force-reload}" - exit 1 - ;; -esac diff --git a/insserv.conf.d/mariadb b/insserv.conf.d/mariadb deleted file mode 100644 index cb29a54..0000000 --- a/insserv.conf.d/mariadb +++ /dev/null @@ -1 +0,0 @@ -$database mysql diff --git a/logcheck/ignore.d.paranoid/mariadb-server-10_1 b/logcheck/ignore.d.paranoid/mariadb-server-10_1 deleted file mode 100644 index 00cc5c3..0000000 --- a/logcheck/ignore.d.paranoid/mariadb-server-10_1 +++ /dev/null @@ -1,9 +0,0 @@ -/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$ -/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ -/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$ -mysqld\[[0-9]+\]: $ -mysqld\[[0-9]+\]: Version: .* socket: '/var/run/mysqld/mysqld.sock' port: 3306$ -mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$ -mysqld_safe\[[0-9]+\]: started$ -usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$ -usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$ diff --git a/logcheck/ignore.d.paranoid/mariadb-server-10_3 b/logcheck/ignore.d.paranoid/mariadb-server-10_3 deleted file mode 100644 index 00cc5c3..0000000 --- a/logcheck/ignore.d.paranoid/mariadb-server-10_3 +++ /dev/null @@ -1,9 +0,0 @@ -/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$ -/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ -/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$ -mysqld\[[0-9]+\]: $ -mysqld\[[0-9]+\]: Version: .* socket: '/var/run/mysqld/mysqld.sock' port: 3306$ -mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$ -mysqld_safe\[[0-9]+\]: started$ -usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$ -usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$ diff --git a/logcheck/ignore.d.server/mariadb-server-10_1 b/logcheck/ignore.d.server/mariadb-server-10_1 deleted file mode 100644 index d6e7f90..0000000 --- a/logcheck/ignore.d.server/mariadb-server-10_1 +++ /dev/null @@ -1,32 +0,0 @@ -/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ -/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$ -/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ -/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$ -mysqld\[[0-9]+\]: ?$ -mysqld\[[0-9]+\]: .*InnoDB: Shutdown completed -mysqld\[[0-9]+\]: .*InnoDB: Started; -mysqld\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$ -mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Normal shutdown$ -mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: ready for connections\.$ -mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Shutdown complete$ -mysqld\[[0-9]+\]: /usr/sbin/mysqld: ready for connections\.$ -mysqld\[[0-9]+\]: .*/usr/sbin/mysqld: Shutdown Complete$ -mysqld\[[0-9]+\]: Version: .* socket -mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$ -mysqld_safe\[[0-9]+\]: ?$ -mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$ -mysqld_safe\[[0-9]+\]: ended$ -mysqld_safe\[[0-9]+\]: http://www.mysql.com$ -mysqld_safe\[[0-9]+\]: NOTE: If you are upgrading from a MySQL <= 3.22.10 you should run$ -mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$ -mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$ -mysqld_safe\[[0-9]+\]: See the manual for more instructions.$ -mysqld_safe\[[0-9]+\]: started$ -mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at http://mariadb.org/jira$ -mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$ -mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$ -mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$ -mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$ -mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$ -usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$ -usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$ diff --git a/logcheck/ignore.d.server/mariadb-server-10_3 b/logcheck/ignore.d.server/mariadb-server-10_3 deleted file mode 100644 index a0b4792..0000000 --- a/logcheck/ignore.d.server/mariadb-server-10_3 +++ /dev/null @@ -1,32 +0,0 @@ -/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ -/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$ -/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ -/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$ -mysqld\[[0-9]+\]: ?$ -mysqld\[[0-9]+\]: .*InnoDB: Shutdown completed -mysqld\[[0-9]+\]: .*InnoDB: Started; -mysqld\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$ -mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Normal shutdown$ -mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: ready for connections\.$ -mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Shutdown complete$ -mysqld\[[0-9]+\]: /usr/sbin/mysqld: ready for connections\.$ -mysqld\[[0-9]+\]: .*/usr/sbin/mysqld: Shutdown Complete$ -mysqld\[[0-9]+\]: Version: .* socket -mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$ -mysqld_safe\[[0-9]+\]: ?$ -mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$ -mysqld_safe\[[0-9]+\]: ended$ -mysqld_safe\[[0-9]+\]: http://www.mysql.com$ -mysqld_safe\[[0-9]+\]: NOTE: If you are upgrading from a MySQL <= 3.22.10 you should run$ -mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$ -mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$ -mysqld_safe\[[0-9]+\]: See the manual for more instructions.$ -mysqld_safe\[[0-9]+\]: started$ -mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$ -mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$ -mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$ -mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$ -mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$ -mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$ -usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$ -usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$ diff --git a/logcheck/ignore.d.workstation/mariadb-server-10_1 b/logcheck/ignore.d.workstation/mariadb-server-10_1 deleted file mode 100644 index a0b4792..0000000 --- a/logcheck/ignore.d.workstation/mariadb-server-10_1 +++ /dev/null @@ -1,32 +0,0 @@ -/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ -/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$ -/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ -/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$ -mysqld\[[0-9]+\]: ?$ -mysqld\[[0-9]+\]: .*InnoDB: Shutdown completed -mysqld\[[0-9]+\]: .*InnoDB: Started; -mysqld\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$ -mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Normal shutdown$ -mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: ready for connections\.$ -mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Shutdown complete$ -mysqld\[[0-9]+\]: /usr/sbin/mysqld: ready for connections\.$ -mysqld\[[0-9]+\]: .*/usr/sbin/mysqld: Shutdown Complete$ -mysqld\[[0-9]+\]: Version: .* socket -mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$ -mysqld_safe\[[0-9]+\]: ?$ -mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$ -mysqld_safe\[[0-9]+\]: ended$ -mysqld_safe\[[0-9]+\]: http://www.mysql.com$ -mysqld_safe\[[0-9]+\]: NOTE: If you are upgrading from a MySQL <= 3.22.10 you should run$ -mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$ -mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$ -mysqld_safe\[[0-9]+\]: See the manual for more instructions.$ -mysqld_safe\[[0-9]+\]: started$ -mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$ -mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$ -mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$ -mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$ -mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$ -mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$ -usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$ -usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$ diff --git a/logcheck/ignore.d.workstation/mariadb-server-10_3 b/logcheck/ignore.d.workstation/mariadb-server-10_3 deleted file mode 100644 index a0b4792..0000000 --- a/logcheck/ignore.d.workstation/mariadb-server-10_3 +++ /dev/null @@ -1,32 +0,0 @@ -/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ -/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$ -/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ -/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$ -mysqld\[[0-9]+\]: ?$ -mysqld\[[0-9]+\]: .*InnoDB: Shutdown completed -mysqld\[[0-9]+\]: .*InnoDB: Started; -mysqld\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$ -mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Normal shutdown$ -mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: ready for connections\.$ -mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Shutdown complete$ -mysqld\[[0-9]+\]: /usr/sbin/mysqld: ready for connections\.$ -mysqld\[[0-9]+\]: .*/usr/sbin/mysqld: Shutdown Complete$ -mysqld\[[0-9]+\]: Version: .* socket -mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$ -mysqld_safe\[[0-9]+\]: ?$ -mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$ -mysqld_safe\[[0-9]+\]: ended$ -mysqld_safe\[[0-9]+\]: http://www.mysql.com$ -mysqld_safe\[[0-9]+\]: NOTE: If you are upgrading from a MySQL <= 3.22.10 you should run$ -mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$ -mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$ -mysqld_safe\[[0-9]+\]: See the manual for more instructions.$ -mysqld_safe\[[0-9]+\]: started$ -mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$ -mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$ -mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$ -mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$ -mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$ -mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$ -usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$ -usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$ diff --git a/logrotate.d/mysql-server b/logrotate.d/mysql-server deleted file mode 100644 index 4111a27..0000000 --- a/logrotate.d/mysql-server +++ /dev/null @@ -1,20 +0,0 @@ -# - I put everything in one block and added sharedscripts, so that mysql gets -# flush-logs'd only once. -# Else the binary logs would automatically increase by n times every day. -# - The error log is obsolete, messages go to syslog now. -/var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log /var/log/mysql/mariadb-slow.log /var/log/mysql/error.log { - daily - rotate 7 - missingok - create 640 mysql adm - compress - sharedscripts - postrotate - test -x /usr/bin/mysqladmin || exit 0 - if [ -f `my_print_defaults --mysqld | grep -oP "pid-file=\K[^$]+"` ]; then - # If this fails, check debian.conf! - mysqladmin --defaults-file=/etc/mysql/debian.cnf --local flush-error-log \ - flush-engine-log flush-general-log flush-slow-log - fi - endscript -} diff --git a/mailcap b/mailcap index dee98b6..c153bee 100644 --- a/mailcap +++ b/mailcap @@ -160,7 +160,6 @@ x-scheme-handler/apt; apturl %s; test=test -n "$DISPLAY" text/x-arduino; /home/mhoellein/arduino-1.8.9/arduino %s; test=test -n "$DISPLAY" text/x-arduino; arduino %s; test=test -n "$DISPLAY" x-scheme-handler/bitcoin; bitcoin-qt %s; test=test -n "$DISPLAY" -application/x-blender; blender %s; test=test -n "$DISPLAY" x-content/blank-cd; nautilus --no-default-window --no-desktop burn:/// %s; test=test -n "$DISPLAY" x-content/blank-dvd; nautilus --no-default-window --no-desktop burn:/// %s; test=test -n "$DISPLAY" x-content/blank-bd; nautilus --no-default-window --no-desktop burn:/// %s; test=test -n "$DISPLAY" @@ -280,7 +279,6 @@ x-scheme-handler/ftp; firefox -private-window %s; test=test -n "$DISPLAY" x-scheme-handler/chrome; firefox -private-window %s; test=test -n "$DISPLAY" video/webm; firefox -private-window %s; test=test -n "$DISPLAY" application/x-xpinstall; firefox -private-window %s; test=test -n "$DISPLAY" -application/vnd.iccprofile; /usr/bin/gcm-import %s; test=test -n "$DISPLAY" application/pkcs12; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" application/pkcs12+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" application/pkcs7-mime; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" diff --git a/mysql/conf.d/mysql.cnf b/mysql/conf.d/mysql.cnf deleted file mode 100644 index 22b052d..0000000 --- a/mysql/conf.d/mysql.cnf +++ /dev/null @@ -1 +0,0 @@ -[mysql] diff --git a/mysql/conf.d/mysqld_safe_syslog.cnf b/mysql/conf.d/mysqld_safe_syslog.cnf deleted file mode 100644 index 08984c1..0000000 --- a/mysql/conf.d/mysqld_safe_syslog.cnf +++ /dev/null @@ -1,3 +0,0 @@ -[mysqld_safe] -skip_log_error -syslog diff --git a/mysql/conf.d/mysqldump.cnf b/mysql/conf.d/mysqldump.cnf deleted file mode 100644 index 38310a9..0000000 --- a/mysql/conf.d/mysqldump.cnf +++ /dev/null @@ -1,4 +0,0 @@ -[mysqldump] -quick -quote-names -max_allowed_packet = 16M diff --git a/mysql/debian-start b/mysql/debian-start deleted file mode 100755 index 7940bbe..0000000 --- a/mysql/debian-start +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# -# This script is executed by "/etc/init.d/mysql" on every (re)start. -# -# Changes to this file will be preserved when updating the Debian package. -# -# NOTE: This file is read only by the traditional SysV init script, not systemd. -# - -source /usr/share/mysql/debian-start.inc.sh - -if [ -f /etc/default/mysql ]; then - . /etc/default/mysql -fi - -MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf" -MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" -MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check" -MYCHECK="/usr/bin/mysqlcheck --defaults-file=/etc/mysql/debian.cnf" -MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables" -MYCHECK_PARAMS="--all-databases --fast --silent" -MYCHECK_RCPT="${MYCHECK_RCPT:-root}" - -## Checking for corrupt, not cleanly closed (only for MyISAM and Aria engines) and upgrade needing tables. - -# The following commands should be run when the server is up but in background -# where they do not block the server start and in one shell instance so that -# they run sequentially. They are supposed not to echo anything to stdout. -# If you want to disable the check for crashed tables comment -# "check_for_crashed_tables" out. -# (There may be no output to stdout inside the background process!) - -# Need to ignore SIGHUP, as otherwise a SIGHUP can sometimes abort the upgrade -# process in the middle. -trap "" SIGHUP -( - upgrade_system_tables_if_necessary; - check_root_accounts; - check_for_crashed_tables; -) >&2 & - -exit 0 diff --git a/mysql/mariadb.cnf b/mysql/mariadb.cnf deleted file mode 100644 index da21212..0000000 --- a/mysql/mariadb.cnf +++ /dev/null @@ -1,19 +0,0 @@ -# MariaDB-specific config file. -# Read by /etc/mysql/my.cnf - -[client] -# Default is Latin1, if you need UTF-8 set this (also in server section) -#default-character-set = utf8 - -[mysqld] -# -# * Character sets -# -# Default is Latin1, if you need UTF-8 set all this (also in client section) -# -#character-set-server = utf8 -#collation-server = utf8_general_ci -#character_set_server = utf8 -#collation_server = utf8_general_ci -# Import all .cnf files from configuration directory -!includedir /etc/mysql/mariadb.conf.d/ diff --git a/mysql/mariadb.conf.d/50-client.cnf b/mysql/mariadb.conf.d/50-client.cnf deleted file mode 100644 index b509f19..0000000 --- a/mysql/mariadb.conf.d/50-client.cnf +++ /dev/null @@ -1,25 +0,0 @@ -# -# This group is read by the client library -# Use it for options that affect all clients, but not the server -# - -[client] -# Default is Latin1, if you need UTF-8 set this (also in server section) -default-character-set = utf8mb4 - -# socket location -socket = /var/run/mysqld/mysqld.sock - -# Example of client certificate usage -# ssl-cert=/etc/mysql/client-cert.pem -# ssl-key=/etc/mysql/client-key.pem -# -# Allow only TLS encrypted connections -# ssl-verify-server-cert=on - -# This group is *never* read by mysql client library, though this -# /etc/mysql/mariadb.cnf.d/client.cnf file is not read by Oracle MySQL -# client anyway. -# If you use the same .cnf file for MySQL and MariaDB, -# use it for MariaDB-only client options -[client-mariadb] diff --git a/mysql/mariadb.conf.d/50-mysql-clients.cnf b/mysql/mariadb.conf.d/50-mysql-clients.cnf deleted file mode 100644 index 55cfda2..0000000 --- a/mysql/mariadb.conf.d/50-mysql-clients.cnf +++ /dev/null @@ -1,24 +0,0 @@ -# -# These groups are read by MariaDB command-line tools -# Use it for options that affect only one utility -# - -[mysql] -# Default is Latin1, if you need UTF-8 set this (also in server section) -default-character-set = utf8mb4 - -[mysql_upgrade] - -[mysqladmin] - -[mysqlbinlog] - -[mysqlcheck] - -[mysqldump] - -[mysqlimport] - -[mysqlshow] - -[mysqlslap] diff --git a/mysql/mariadb.conf.d/50-mysqld_safe.cnf b/mysql/mariadb.conf.d/50-mysqld_safe.cnf deleted file mode 100644 index 141d51f..0000000 --- a/mysql/mariadb.conf.d/50-mysqld_safe.cnf +++ /dev/null @@ -1,30 +0,0 @@ -# NOTE: This file is read only by the traditional SysV init script, not systemd. -# MariaDB systemd does _not_ utilize mysqld_safe nor read this file. -# -# For similar behaviour, systemd users should create the following file: -# /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf -# -# To achieve the same result as the default 50-mysqld_safe.cnf, please create -# /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf -# with the following contents: -# -# [Service] -# User=mysql -# StandardOutput=syslog -# StandardError=syslog -# SyslogFacility=daemon -# SyslogLevel=err -# SyslogIdentifier=mysqld -# -# For more information, please read https://mariadb.com/kb/en/mariadb/systemd/ -# - -[mysqld_safe] -# This will be passed to all mysql clients -# It has been reported that passwords should be enclosed with ticks/quotes -# especially if they contain "#" chars... -# Remember to edit /etc/mysql/debian.cnf when changing the socket location. -socket = /var/run/mysqld/mysqld.sock -nice = 0 -skip_log_error -syslog diff --git a/mysql/mariadb.conf.d/50-server.cnf b/mysql/mariadb.conf.d/50-server.cnf deleted file mode 100644 index ee30148..0000000 --- a/mysql/mariadb.conf.d/50-server.cnf +++ /dev/null @@ -1,134 +0,0 @@ -# -# These groups are read by MariaDB server. -# Use it for options that only the server (but not clients) should see -# -# See the examples of server my.cnf files in /usr/share/mysql/ -# - -# this is read by the standalone daemon and embedded servers -[server] - -# this is only for the mysqld standalone daemon -[mysqld] - -# -# * Basic Settings -# -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -lc-messages-dir = /usr/share/mysql -skip-external-locking - -# Instead of skip-networking the default is now to listen only on -# localhost which is more compatible and is not less secure. -bind-address = 127.0.0.1 - -# -# * Fine Tuning -# -key_buffer_size = 16M -max_allowed_packet = 16M -thread_stack = 192K -thread_cache_size = 8 -# This replaces the startup script and checks MyISAM tables if needed -# the first time they are touched -myisam_recover_options = BACKUP -#max_connections = 100 -#table_cache = 64 -#thread_concurrency = 10 - -# -# * Query Cache Configuration -# -query_cache_limit = 1M -query_cache_size = 16M - -# -# * Logging and Replication -# -# Both location gets rotated by the cronjob. -# Be aware that this log type is a performance killer. -# As of 5.1 you can enable the log at runtime! -#general_log_file = /var/log/mysql/mysql.log -#general_log = 1 -# -# Error log - should be very few entries. -# -log_error = /var/log/mysql/error.log -# -# Enable the slow query log to see queries with especially long duration -#slow_query_log_file = /var/log/mysql/mariadb-slow.log -#long_query_time = 10 -#log_slow_rate_limit = 1000 -#log_slow_verbosity = query_plan -#log-queries-not-using-indexes -# -# The following can be used as easy to replay backup logs or for replication. -# note: if you are setting up a replication slave, see README.Debian about -# other settings you may need to change. -#server-id = 1 -#log_bin = /var/log/mysql/mysql-bin.log -expire_logs_days = 10 -max_binlog_size = 100M -#binlog_do_db = include_database_name -#binlog_ignore_db = exclude_database_name - -# -# * InnoDB -# -# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. -# Read the manual for more InnoDB related options. There are many! - -# -# * Security Features -# -# Read the manual, too, if you want chroot! -# chroot = /var/lib/mysql/ -# -# For generating SSL certificates you can use for example the GUI tool "tinyca". -# -# ssl-ca=/etc/mysql/cacert.pem -# ssl-cert=/etc/mysql/server-cert.pem -# ssl-key=/etc/mysql/server-key.pem -# -# Accept only connections using the latest and most secure TLS protocol version. -# ..when MariaDB is compiled with OpenSSL: -# ssl-cipher=TLSv1.2 -# ..when MariaDB is compiled with YaSSL (default in Debian): -# ssl=on - -# -# * Character sets -# -# MySQL/MariaDB default is Latin1, but in Debian we rather default to the full -# utf8 4-byte character set. See also client.cnf -# -character-set-server = utf8mb4 -collation-server = utf8mb4_general_ci - -# -# * Unix socket authentication plugin is built-in since 10.0.22-6 -# -# Needed so the root database user can authenticate without a password but -# only when running as the unix root user. -# -# Also available for other users if required. -# See https://mariadb.com/kb/en/unix_socket-authentication-plugin/ - -# this is only for embedded server -[embedded] - -# This group is only read by MariaDB servers, not by MySQL. -# If you use the same .cnf file for MySQL and MariaDB, -# you can put MariaDB-only options here -[mariadb] - -# This group is only read by MariaDB-10.1 servers. -# If you use the same .cnf file for MariaDB of different versions, -# use this group for options that older servers don't understand -[mariadb-10.1] diff --git a/mysql/my.cnf.fallback b/mysql/my.cnf.fallback deleted file mode 100644 index 92747d8..0000000 --- a/mysql/my.cnf.fallback +++ /dev/null @@ -1,23 +0,0 @@ -# -# The MySQL database server configuration file. -# -# You can copy this to one of: -# - "/etc/mysql/my.cnf" to set global options, -# - "~/.my.cnf" to set user-specific options. -# -# One can use all long options that the program supports. -# Run program with --help to get a list of available options and with -# --print-defaults to see which it would actually understand and use. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -# This will be passed to all mysql clients -# It has been reported that passwords should be enclosed with ticks/quotes -# escpecially if they contain "#" chars... -# Remember to edit /etc/mysql/debian.cnf when changing the socket location. - -# Here is entries for some specific programs -# The following values assume you have at least 32M ram - -!includedir /etc/mysql/conf.d/ diff --git a/printcap b/printcap new file mode 120000 index 0000000..9540cf1 --- /dev/null +++ b/printcap @@ -0,0 +1 @@ +/run/cups/printcap \ No newline at end of file diff --git a/rc0.d/K02mysql b/rc0.d/K02mysql deleted file mode 120000 index 4fa2088..0000000 --- a/rc0.d/K02mysql +++ /dev/null @@ -1 +0,0 @@ -../init.d/mysql \ No newline at end of file diff --git a/rc1.d/K01saned b/rc1.d/K01saned deleted file mode 120000 index 4c6451c..0000000 --- a/rc1.d/K01saned +++ /dev/null @@ -1 +0,0 @@ -../init.d/saned \ No newline at end of file diff --git a/rc1.d/K02mysql b/rc1.d/K02mysql deleted file mode 120000 index 4fa2088..0000000 --- a/rc1.d/K02mysql +++ /dev/null @@ -1 +0,0 @@ -../init.d/mysql \ No newline at end of file diff --git a/rc2.d/S03mysql b/rc2.d/S03mysql deleted file mode 120000 index 4fa2088..0000000 --- a/rc2.d/S03mysql +++ /dev/null @@ -1 +0,0 @@ -../init.d/mysql \ No newline at end of file diff --git a/rc2.d/S04postfix b/rc2.d/S03postfix similarity index 100% rename from rc2.d/S04postfix rename to rc2.d/S03postfix diff --git a/rc2.d/S06saned b/rc2.d/S06saned deleted file mode 120000 index 4c6451c..0000000 --- a/rc2.d/S06saned +++ /dev/null @@ -1 +0,0 @@ -../init.d/saned \ No newline at end of file diff --git a/rc3.d/S03mysql b/rc3.d/S03mysql deleted file mode 120000 index 4fa2088..0000000 --- a/rc3.d/S03mysql +++ /dev/null @@ -1 +0,0 @@ -../init.d/mysql \ No newline at end of file diff --git a/rc3.d/S04postfix b/rc3.d/S03postfix similarity index 100% rename from rc3.d/S04postfix rename to rc3.d/S03postfix diff --git a/rc3.d/S06saned b/rc3.d/S06saned deleted file mode 120000 index 4c6451c..0000000 --- a/rc3.d/S06saned +++ /dev/null @@ -1 +0,0 @@ -../init.d/saned \ No newline at end of file diff --git a/rc4.d/S03mysql b/rc4.d/S03mysql deleted file mode 120000 index 4fa2088..0000000 --- a/rc4.d/S03mysql +++ /dev/null @@ -1 +0,0 @@ -../init.d/mysql \ No newline at end of file diff --git a/rc4.d/S04postfix b/rc4.d/S03postfix similarity index 100% rename from rc4.d/S04postfix rename to rc4.d/S03postfix diff --git a/rc4.d/S06saned b/rc4.d/S06saned deleted file mode 120000 index 4c6451c..0000000 --- a/rc4.d/S06saned +++ /dev/null @@ -1 +0,0 @@ -../init.d/saned \ No newline at end of file diff --git a/rc5.d/S03mysql b/rc5.d/S03mysql deleted file mode 120000 index 4fa2088..0000000 --- a/rc5.d/S03mysql +++ /dev/null @@ -1 +0,0 @@ -../init.d/mysql \ No newline at end of file diff --git a/rc5.d/S04postfix b/rc5.d/S03postfix similarity index 100% rename from rc5.d/S04postfix rename to rc5.d/S03postfix diff --git a/rc5.d/S06saned b/rc5.d/S06saned deleted file mode 120000 index 4c6451c..0000000 --- a/rc5.d/S06saned +++ /dev/null @@ -1 +0,0 @@ -../init.d/saned \ No newline at end of file diff --git a/rc6.d/K02mysql b/rc6.d/K02mysql deleted file mode 120000 index 4fa2088..0000000 --- a/rc6.d/K02mysql +++ /dev/null @@ -1 +0,0 @@ -../init.d/mysql \ No newline at end of file diff --git a/sane.d/dll.d/hplip b/sane.d/dll.d/hplip deleted file mode 100644 index 30fd4fc..0000000 --- a/sane.d/dll.d/hplip +++ /dev/null @@ -1,4 +0,0 @@ -# dll.conf snippet for hplip -# - -hpaio diff --git a/sane.d/saned.conf b/sane.d/saned.conf deleted file mode 100644 index 664e459..0000000 --- a/sane.d/saned.conf +++ /dev/null @@ -1,31 +0,0 @@ -# saned.conf -# Configuration for the saned daemon - -## Daemon options -# Port range for the data connection. Choose a range inside [1024 - 65535]. -# Avoid specifying too large a range, for performance reasons. -# -# ONLY use this if your saned server is sitting behind a firewall. If your -# firewall is a Linux machine, we strongly recommend using the -# Netfilter nf_conntrack_sane connection tracking module instead. -# -# data_portrange = 10000 - 10100 - - -## Access list -# A list of host names, IP addresses or IP subnets (CIDR notation) that -# are permitted to use local SANE devices. IPv6 addresses must be enclosed -# in brackets, and should always be specified in their compressed form. -# -# The hostname matching is not case-sensitive. - -#scan-client.somedomain.firm -#192.168.0.1 -#192.168.0.1/29 -#[2001:db8:185e::42:12] -#[2001:db8:185e::42:12]/64 - -# NOTE: /etc/inetd.conf (or /etc/xinetd.conf) and -# /etc/services must also be properly configured to start -# the saned daemon as documented in saned(8), services(4) -# and inetd.conf(4) (or xinetd.conf(5)). diff --git a/systemd/system/multi-user.target.wants/mariadb.service b/systemd/system/multi-user.target.wants/mariadb.service deleted file mode 120000 index fd9e114..0000000 --- a/systemd/system/multi-user.target.wants/mariadb.service +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/mariadb.service \ No newline at end of file diff --git a/systemd/system/mysql.service b/systemd/system/mysql.service deleted file mode 120000 index fd9e114..0000000 --- a/systemd/system/mysql.service +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/mariadb.service \ No newline at end of file diff --git a/systemd/system/mysqld.service b/systemd/system/mysqld.service deleted file mode 120000 index fd9e114..0000000 --- a/systemd/system/mysqld.service +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/mariadb.service \ No newline at end of file -- 2.43.0