Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Ubuntu, especially for USN-3087-1 and USN-3087-2 #2182

Merged
merged 1 commit into from
Sep 26, 2016

Conversation

tianon
Copy link
Member

@tianon tianon commented Sep 23, 2016

@tianon
Copy link
Member Author

tianon commented Sep 23, 2016

diff --git a/ubuntu_devel/build-info.txt b/ubuntu_devel/build-info.txt
index 0f0ffa1..e99a96f 100644
--- a/ubuntu_devel/build-info.txt
+++ b/ubuntu_devel/build-info.txt
@@ -1 +1 @@
-SERIAL=20160919
+SERIAL=20160923.1
diff --git a/ubuntu_devel/ubuntu-yakkety-core-cloudimg-amd64-root.tar.gz b/ubuntu_devel/ubuntu-yakkety-core-cloudimg-amd64-root.tar.gz
index c3f985e..4f5b690 100644
Binary files a/ubuntu_devel/ubuntu-yakkety-core-cloudimg-amd64-root.tar.gz and b/ubuntu_devel/ubuntu-yakkety-core-cloudimg-amd64-root.tar.gz differ
diff --git a/ubuntu_devel/ubuntu-yakkety-core-cloudimg-amd64-root.tar.gz  'tar -t' b/ubuntu_devel/ubuntu-yakkety-core-cloudimg-amd64-root.tar.gz  'tar -t'
index 22e9f8b..fb9914d 100644
--- a/ubuntu_devel/ubuntu-yakkety-core-cloudimg-amd64-root.tar.gz  'tar -t' 
+++ b/ubuntu_devel/ubuntu-yakkety-core-cloudimg-amd64-root.tar.gz  'tar -t' 
@@ -114,8 +114,11 @@ etc/apt/apt.conf.d/70debconf
 etc/apt/preferences.d/
 etc/apt/sources.list
 etc/apt/sources.list.d/
-etc/apt/trusted.gpg
 etc/apt/trusted.gpg.d/
+etc/apt/trusted.gpg.d/ubuntu-keyring-2004-archive.gpg
+etc/apt/trusted.gpg.d/ubuntu-keyring-2004-cdimage.gpg
+etc/apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg
+etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg
 etc/bash.bashrc
 etc/bindresvport.blacklist
 etc/cron.daily/
@@ -6584,8 +6587,6 @@ var/cache/ldconfig/
 var/cache/ldconfig/aux-cache
 var/lib/
 var/lib/apt/
-var/lib/apt/keyrings/
-var/lib/apt/keyrings/ubuntu-archive-keyring.gpg
 var/lib/apt/lists/
 var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_yakkety_InRelease
 var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_yakkety_main_binary-amd64_Packages
diff --git a/ubuntu_devel/ubuntu-yakkety-core-cloudimg-amd64.manifest b/ubuntu_devel/ubuntu-yakkety-core-cloudimg-amd64.manifest
index e820459..d47c785 100644
--- a/ubuntu_devel/ubuntu-yakkety-core-cloudimg-amd64.manifest
+++ b/ubuntu_devel/ubuntu-yakkety-core-cloudimg-amd64.manifest
@@ -20,7 +20,7 @@ gpgv  2.1.15-1ubuntu3
 grep   2.25-6
 gzip   1.6-4ubuntu1
 hostname   3.18
-init-system-helpers    1.44
+init-system-helpers    1.45
 libacl1:amd64  2.2.52-3
 libapt-pkg5.0:amd64    1.3~rc4ubuntu1
 libassuan0:amd64   2.4.3-1
@@ -58,32 +58,32 @@ libsemanage-common  2.5-1
 libsemanage1:amd64 2.5-1
 libsepol1:amd64    2.5-1
 libsmartcols1:amd64    2.28.2-1ubuntu1
-libsqlite3-0:amd64 3.14.1-1
+libsqlite3-0:amd64 3.14.1-1build1
 libss2:amd64   1.43.1-1
 libstdc++6:amd64   6.2.0-3ubuntu15
-libsystemd0:amd64  231-6
+libsystemd0:amd64  231-6git1
 libtinfo5:amd64    6.0+20160625-1ubuntu1
-libudev1:amd64 231-6
+libudev1:amd64 231-6git1
 libustr-1.0-1:amd64    1.0.4-5
 libuuid1:amd64 2.28.2-1ubuntu1
 locales    2.24-0ubuntu1
-login  1:4.2-3.1ubuntu6
+login  1:4.2-3.2ubuntu1
 lsb-base   9.20160110ubuntu5
 mawk   1.3.3-17ubuntu2
 mount  2.28.2-1ubuntu1
 multiarch-support  2.24-0ubuntu1
 ncurses-base   6.0+20160625-1ubuntu1
 ncurses-bin    6.0+20160625-1ubuntu1
-passwd 1:4.2-3.1ubuntu6
+passwd 1:4.2-3.2ubuntu1
 perl-base  5.22.2-3
 pinentry-curses    0.9.7-5
 procps 2:3.3.12-1ubuntu2
 readline-common    7.0-0ubuntu2
-sed    4.2.2-7.1
+sed    4.2.2-8
 sensible-utils 0.0.9
 sysvinit-utils 2.88dsf-59.8git1
 tar    1.29b-1
 tzdata 2016f-1
-ubuntu-keyring 2016.09.01
+ubuntu-keyring 2016.09.19
 util-linux 2.28.2-1ubuntu1
 zlib1g:amd64   1:1.2.8.dfsg-2ubuntu5
diff --git a/ubuntu_latest/build-info.txt b/ubuntu_latest/build-info.txt
index 3017036..e99a96f 100644
--- a/ubuntu_latest/build-info.txt
+++ b/ubuntu_latest/build-info.txt
@@ -1 +1 @@
-SERIAL=20160914
+SERIAL=20160923.1
diff --git a/ubuntu_latest/ubuntu-xenial-core-cloudimg-amd64-root.tar.gz b/ubuntu_latest/ubuntu-xenial-core-cloudimg-amd64-root.tar.gz
index 2489c68..08c42b7 100644
Binary files a/ubuntu_latest/ubuntu-xenial-core-cloudimg-amd64-root.tar.gz and b/ubuntu_latest/ubuntu-xenial-core-cloudimg-amd64-root.tar.gz differ
diff --git a/ubuntu_precise/build-info.txt b/ubuntu_precise/build-info.txt
index 41c765e..e99a96f 100644
--- a/ubuntu_precise/build-info.txt
+++ b/ubuntu_precise/build-info.txt
@@ -1 +1 @@
-SERIAL=20160819
+SERIAL=20160923.1
diff --git a/ubuntu_precise/ubuntu-precise-core-cloudimg-amd64-root.tar.gz b/ubuntu_precise/ubuntu-precise-core-cloudimg-amd64-root.tar.gz
index 2303465..7806a17 100644
Binary files a/ubuntu_precise/ubuntu-precise-core-cloudimg-amd64-root.tar.gz and b/ubuntu_precise/ubuntu-precise-core-cloudimg-amd64-root.tar.gz differ
diff --git a/ubuntu_precise/ubuntu-precise-core-cloudimg-amd64.manifest b/ubuntu_precise/ubuntu-precise-core-cloudimg-amd64.manifest
index 88a4889..c1b5fc6 100644
--- a/ubuntu_precise/ubuntu-precise-core-cloudimg-amd64.manifest
+++ b/ubuntu_precise/ubuntu-precise-core-cloudimg-amd64.manifest
@@ -65,7 +65,7 @@ libreadline6  6.2-8
 libselinux1    2.1.0-4.1ubuntu1
 libslang2  2.2.4-3ubuntu1
 libss2 1.42-1ubuntu2.3
-libssl1.0.0    1.0.1-4ubuntu5.36
+libssl1.0.0    1.0.1-4ubuntu5.38
 libstdc++6 4.6.3-1ubuntu5
 libtinfo5  5.9-4
 libudev0   175-0ubuntu9.10
diff --git a/ubuntu_trusty/build-info.txt b/ubuntu_trusty/build-info.txt
index 3017036..e99a96f 100644
--- a/ubuntu_trusty/build-info.txt
+++ b/ubuntu_trusty/build-info.txt
@@ -1 +1 @@
-SERIAL=20160914
+SERIAL=20160923.1
diff --git a/ubuntu_trusty/ubuntu-trusty-core-cloudimg-amd64-root.tar.gz b/ubuntu_trusty/ubuntu-trusty-core-cloudimg-amd64-root.tar.gz
index bc45515..38f2076 100644
Binary files a/ubuntu_trusty/ubuntu-trusty-core-cloudimg-amd64-root.tar.gz and b/ubuntu_trusty/ubuntu-trusty-core-cloudimg-amd64-root.tar.gz differ
diff --git a/ubuntu_trusty/ubuntu-trusty-core-cloudimg-amd64.manifest b/ubuntu_trusty/ubuntu-trusty-core-cloudimg-amd64.manifest
index 319fc2e..7e846f3 100644
--- a/ubuntu_trusty/ubuntu-trusty-core-cloudimg-amd64.manifest
+++ b/ubuntu_trusty/ubuntu-trusty-core-cloudimg-amd64.manifest
@@ -108,8 +108,8 @@ libpod-latex-perl   0.61-1
 libpopt0:amd64 1.16-8ubuntu1
 libprocps3:amd64   1:3.3.9-1ubuntu2.2
 libpython3-stdlib:amd64    3.4.0-0ubuntu2
-libpython3.4-minimal:amd64 3.4.3-1ubuntu1~14.04.3
-libpython3.4-stdlib:amd64  3.4.3-1ubuntu1~14.04.3
+libpython3.4-minimal:amd64 3.4.3-1ubuntu1~14.04.4
+libpython3.4-stdlib:amd64  3.4.3-1ubuntu1~14.04.4
 libreadline6:amd64 6.3-4ubuntu2
 libselinux1:amd64  2.2.2-1ubuntu0.1
 libsemanage-common 2.2-1
@@ -118,7 +118,7 @@ libsepol1:amd64 2.2-1ubuntu0.1
 libslang2:amd64    2.2.4-15ubuntu1
 libsqlite3-0:amd64 3.8.2-1ubuntu2.1
 libss2:amd64   1.42.9-3ubuntu1.3
-libssl1.0.0:amd64  1.0.1f-1ubuntu2.19
+libssl1.0.0:amd64  1.0.1f-1ubuntu2.21
 libstdc++6:amd64   4.8.4-2ubuntu1~14.04.3
 libtasn1-6:amd64   3.4-3ubuntu0.4
 libterm-ui-perl    0.42-1
@@ -158,8 +158,8 @@ plymouth    0.8.8-0ubuntu17.1
 procps 1:3.3.9-1ubuntu2.2
 python3    3.4.0-0ubuntu2
 python3-minimal    3.4.0-0ubuntu2
-python3.4  3.4.3-1ubuntu1~14.04.3
-python3.4-minimal  3.4.3-1ubuntu1~14.04.3
+python3.4  3.4.3-1ubuntu1~14.04.4
+python3.4-minimal  3.4.3-1ubuntu1~14.04.4
 readline-common    6.3-4ubuntu2
 resolvconf 1.69ubuntu1.1
 rsyslog    7.4.4-1ubuntu2.6

@tianon
Copy link
Member Author

tianon commented Sep 23, 2016

Build test of #2182; e4afe2f (ubuntu):

$ bashbrew build ubuntu:12.04.5
Building bashbrew/cache:e3c8e29fa387d0f99587ee33f1bf8ca4ba2cb7bacaac464dc17f47eb358f9800 (ubuntu:12.04.5)
Tagging ubuntu:12.04.5
Tagging ubuntu:12.04
Tagging ubuntu:precise-20160923.1
Tagging ubuntu:precise

$ test/run.sh ubuntu:12.04.5
testing ubuntu:12.04.5
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'debian-apt-get' [5/5]...passed


$ bashbrew build ubuntu:14.04.5
Building bashbrew/cache:62660ee3739b27c822fd20ed4b817b3cef6d2f1a7673fb9b0ba2ea0f7a472629 (ubuntu:14.04.5)
Tagging ubuntu:14.04.5
Tagging ubuntu:14.04
Tagging ubuntu:trusty-20160923.1
Tagging ubuntu:trusty

$ test/run.sh ubuntu:14.04.5
testing ubuntu:14.04.5
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'debian-apt-get' [5/5]...passed


$ bashbrew build ubuntu:16.04
Building bashbrew/cache:2067010dcb7698aa95d99dfb48c877a56a5b216075a782f671d1d7399f653807 (ubuntu:16.04)
Tagging ubuntu:16.04
Tagging ubuntu:xenial-20160923.1
Tagging ubuntu:xenial
Tagging ubuntu:latest

$ test/run.sh ubuntu:16.04
testing ubuntu:16.04
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'debian-apt-get' [5/5]...passed


$ bashbrew build ubuntu:16.10
Building bashbrew/cache:b9ce9143dcb19dd5e171cee7364a22e956d6f710afc455f62b8148e288a327e5 (ubuntu:16.10)
Tagging ubuntu:16.10
Tagging ubuntu:yakkety-20160923.1
Tagging ubuntu:yakkety
Tagging ubuntu:devel

$ test/run.sh ubuntu:16.10
testing ubuntu:16.10
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'debian-apt-get' [5/5]...passed

@tianon
Copy link
Member Author

tianon commented Sep 23, 2016

Apparently merging both Debian and Alpine updates has taken the automated builds system queue right to the limit. 😇

In order to make sure we don't cause major issues, merging this is going to hold off a bit. 👍

@caervs
Copy link
Contributor

caervs commented Sep 23, 2016

@tianon Thank you 😄

@tianon
Copy link
Member Author

tianon commented Sep 26, 2016

This has been further re-complicated by https://www.openssl.org/news/secadv/20160926.txt, I think (#2171 (comment)).

@tianon
Copy link
Member Author

tianon commented Sep 26, 2016

I think today's advisory does not apply here (or in Debian; #2171 (comment)). We should be safe to carry on here.

@tianon tianon merged commit 9e499a1 into docker-library:master Sep 26, 2016
@tianon tianon deleted the ubuntu-openssl branch September 26, 2016 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants