From: Frank Brehm Date: Wed, 19 Jul 2017 16:24:54 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=222b5461f3f36cbd9d47f4e9cfac4d1ac52a38cc;p=config%2Fsarah%2Fetc.git saving uncommitted changes in /etc prior to apt run --- diff --git a/.etckeeper b/.etckeeper index 1f977b1..a6bf751 100755 --- a/.etckeeper +++ b/.etckeeper @@ -103,6 +103,7 @@ maybe chmod 0644 'apt/apt.conf.d/01autoremove-kernels' maybe chmod 0644 'apt/apt.conf.d/05etckeeper' maybe chmod 0644 'apt/apt.conf.d/70debconf' maybe chmod 0644 'apt/apt.conf.d/99force-ipv4' +maybe chmod 0644 'apt/foreign-packages.txt.2017-07-19.00' maybe chmod 0755 'apt/preferences.d' maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key.pub' maybe chmod 0644 'apt/repo.uhu-banane.de.gpg-key2.pub' @@ -111,11 +112,11 @@ maybe chmod 0644 'apt/sources.list.bak' maybe chmod 0755 'apt/sources.list.d' maybe chmod 0644 'apt/sources.list.d/fbrehm.list' maybe chmod 0644 'apt/sources.list.d/fbrehm.list.bak' -maybe chmod 0644 'apt/sources.list.d/fbrehm.list.new' +maybe chmod 0644 'apt/sources.list.d/fbrehm.list.new.bak' maybe chmod 0644 'apt/sources.list.d/salt.list' maybe chmod 0644 'apt/sources.list.d/salt.list.bak' -maybe chmod 0644 'apt/sources.list.d/salt.list.new' -maybe chmod 0644 'apt/sources.list.new' +maybe chmod 0644 'apt/sources.list.d/salt.list.new.bak' +maybe chmod 0644 'apt/sources.list.new.bak' maybe chmod 0644 'apt/trusted.gpg' maybe chmod 0755 'apt/trusted.gpg.d' maybe chmod 0644 'apt/trusted.gpg.d/debian-archive-jessie-automatic.gpg' diff --git a/apt/foreign-packages.txt.2017-07-19.00 b/apt/foreign-packages.txt.2017-07-19.00 new file mode 100644 index 0000000..25b4ae7 --- /dev/null +++ b/apt/foreign-packages.txt.2017-07-19.00 @@ -0,0 +1,32 @@ +flake8 (3.2.1-1~bpo8+1) [Debian Backports: 3.2.1-1~bpo8+1] +git (1:2.11.0-3~bpo8+1) [Debian Backports: 1:2.11.0-3~bpo8+1] [Debian: 1:2.1.4-2.1+deb8u3 1:2.1.4-2.1+deb8u2] +git-email (1:2.11.0-3~bpo8+1) [Debian Backports: 1:2.11.0-3~bpo8+1] [Debian: 1:2.1.4-2.1+deb8u3 1:2.1.4-2.1+deb8u2] +git-man (1:2.11.0-3~bpo8+1) [Debian Backports: 1:2.11.0-3~bpo8+1] [Debian: 1:2.1.4-2.1+deb8u3 1:2.1.4-2.1+deb8u2] +libsodium13 (1.0.3-1) [SaltStack: 1.0.3-1] [Debian: 1.0.0-1] +libzmq3 (4.0.5+dfsg-3) [SaltStack: 4.0.5+dfsg-3] [Debian: 4.0.5+dfsg-2+deb8u1 4.0.5+dfsg-2+deb8u1] +linux-base (4.3~bpo8+1) [Debian Backports: 4.3~bpo8+1] [Debian: 3.5] +linux-image-4.9.0-0.bpo.2-amd64 (4.9.18-1~bpo8+1) [Debian Backports: 4.9.18-1~bpo8+1] +linux-image-4.9.0-0.bpo.3-amd64 (4.9.30-2+deb9u2~bpo8+1) [Debian Backports: 4.9.30-2+deb9u2~bpo8+1] +linux-image-amd64 (4.9+80~bpo8+1) [Debian Backports: 4.9+80~bpo8+1] [Debian: 3.16+63] +pyflakes (1.3.0-1~bpo8+1) [Debian Backports: 1.3.0-1~bpo8+1] [Debian: 0.8.1-1] +pyflakes3 (1.3.0-1~bpo8+1) [Debian Backports: 1.3.0-1~bpo8+1] +python3-flake8 (3.2.1-1~bpo8+1) [Debian Backports: 3.2.1-1~bpo8+1] [Debian: 2.2.2-1] +python3-mccabe (0.5.3-1~bpo8+1) [Debian Backports: 0.5.3-1~bpo8+1] [Debian: 0.2.1-1] +python3-pb-base (0.7.5~deb8) +python3-pb-logging (0.5.3~deb8) +python3-pkg-resources (33.1.1-1~bpo8+1) [Debian Backports: 33.1.1-1~bpo8+1] [Debian: 5.5.1-1] +python3-pycodestyle (2.2.0-2~bpo8+1) [Debian Backports: 2.2.0-2~bpo8+1] +python3-pyflakes (1.3.0-1~bpo8+1) [Debian Backports: 1.3.0-1~bpo8+1] +python3-setuptools (33.1.1-1~bpo8+1) [Debian Backports: 33.1.1-1~bpo8+1] [Debian: 5.5.1-1] +python-concurrent.futures (3.0.3-1) [SaltStack: 3.0.3-1] [Debian Backports: 3.0.5-2~bpo8+1] [Debian: 2.2.0-1] +python-jinja2 (2.9.4-1) [SaltStack: 2.9.4-1] [Debian Backports: 2.8-1~bpo8+1] [Debian: 2.7.3-1] +python-pb-base (0.7.5~deb8) +python-pb-base-nls (0.7.5~deb8) +python-pb-logging (0.5.3~deb8) +python-pyflakes (1.3.0-1~bpo8+1) [Debian Backports: 1.3.0-1~bpo8+1] +python-requests (2.7.0-3) [SaltStack: 2.7.0-3] [Debian Backports: 2.11.1-1~bpo8+1] [Debian: 2.4.3-6] +python-systemd (231-2~bpo8+1) [SaltStack: 231-2~bpo8+1] [Debian Backports: 233-1~bpo8+1] +python-tornado (4.2.1-1~ds+1) [SaltStack: 4.2.1-1~ds+1] [Debian Backports: 4.4.3-1~bpo8+1] [Debian: 3.2.2-1.1] +python-urllib3 (1.10.4-1) [SaltStack: 1.10.4-1] [Debian Backports: 1.16-1~bpo8+1] [Debian: 1.9.1-3] +salt-common (2017.7.0+ds-1) [SaltStack: 2017.7.0+ds-1] [Debian Backports: 2016.11.2+ds-1~bpo8+1] [Debian: 2014.1.13+ds-3] +salt-minion (2017.7.0+ds-1) [SaltStack: 2017.7.0+ds-1] [Debian Backports: 2016.11.2+ds-1~bpo8+1] [Debian: 2014.1.13+ds-3] diff --git a/apt/sources.list.d/fbrehm.list.new b/apt/sources.list.d/fbrehm.list.new deleted file mode 100644 index 7e43b75..0000000 --- a/apt/sources.list.d/fbrehm.list.new +++ /dev/null @@ -1,6 +0,0 @@ -# Packages Frank Brehm -# --------------------- - -#deb http://www.brehm-online.com/debian/stretch ./ -deb http://repo.uhu-banane.de/Debian/stretch ./ -deb-src http://repo.uhu-banane.de/Sources ./ diff --git a/apt/sources.list.d/fbrehm.list.new.bak b/apt/sources.list.d/fbrehm.list.new.bak new file mode 100644 index 0000000..7e43b75 --- /dev/null +++ b/apt/sources.list.d/fbrehm.list.new.bak @@ -0,0 +1,6 @@ +# Packages Frank Brehm +# --------------------- + +#deb http://www.brehm-online.com/debian/stretch ./ +deb http://repo.uhu-banane.de/Debian/stretch ./ +deb-src http://repo.uhu-banane.de/Sources ./ diff --git a/apt/sources.list.d/salt.list.new b/apt/sources.list.d/salt.list.new deleted file mode 100644 index 9383dc2..0000000 --- a/apt/sources.list.d/salt.list.new +++ /dev/null @@ -1 +0,0 @@ -deb http://repo.saltstack.com/apt/debian/9/amd64/latest stretch main diff --git a/apt/sources.list.d/salt.list.new.bak b/apt/sources.list.d/salt.list.new.bak new file mode 100644 index 0000000..9383dc2 --- /dev/null +++ b/apt/sources.list.d/salt.list.new.bak @@ -0,0 +1 @@ +deb http://repo.saltstack.com/apt/debian/9/amd64/latest stretch main diff --git a/apt/sources.list.new b/apt/sources.list.new deleted file mode 100644 index 88838d9..0000000 --- a/apt/sources.list.new +++ /dev/null @@ -1,19 +0,0 @@ -# deb http://ftp-stud.hs-esslingen.de/debian stretch main - -# main stretch repositories -deb http://ftp-stud.hs-esslingen.de/debian stretch main contrib non-free -deb-src http://ftp-stud.hs-esslingen.de/debian stretch main contrib non-free - -# stretch security updates -deb http://security.debian.org/ stretch/updates main contrib non-free -deb-src http://security.debian.org/ stretch/updates main contrib non-free - -# stretch-updates, previously known as 'volatile' -deb http://ftp-stud.hs-esslingen.de/debian stretch-updates main contrib non-free -deb-src http://ftp-stud.hs-esslingen.de/debian stretch-updates main contrib non-free - -# stretch-backports, previously on backports.debian.org -deb http://ftp-stud.hs-esslingen.de/debian/ stretch-backports main contrib non-free -deb-src http://ftp-stud.hs-esslingen.de/debian/ stretch-backports main contrib non-free - -# vim: noet ts=8 diff --git a/apt/sources.list.new.bak b/apt/sources.list.new.bak new file mode 100644 index 0000000..88838d9 --- /dev/null +++ b/apt/sources.list.new.bak @@ -0,0 +1,19 @@ +# deb http://ftp-stud.hs-esslingen.de/debian stretch main + +# main stretch repositories +deb http://ftp-stud.hs-esslingen.de/debian stretch main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian stretch main contrib non-free + +# stretch security updates +deb http://security.debian.org/ stretch/updates main contrib non-free +deb-src http://security.debian.org/ stretch/updates main contrib non-free + +# stretch-updates, previously known as 'volatile' +deb http://ftp-stud.hs-esslingen.de/debian stretch-updates main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian stretch-updates main contrib non-free + +# stretch-backports, previously on backports.debian.org +deb http://ftp-stud.hs-esslingen.de/debian/ stretch-backports main contrib non-free +deb-src http://ftp-stud.hs-esslingen.de/debian/ stretch-backports main contrib non-free + +# vim: noet ts=8