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

Updating 6.9, 6-slim, 7.4, 7-slim to address CVE-2017-7805 #3518

Merged
merged 1 commit into from
Sep 30, 2017
Merged

Updating 6.9, 6-slim, 7.4, 7-slim to address CVE-2017-7805 #3518

merged 1 commit into from
Sep 30, 2017

Conversation

Djelibeybi
Copy link
Contributor

@tianon
Copy link
Member

tianon commented Sep 30, 2017

Diff:
diff --git a/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz b/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz
index 212ed56..44ef826 100644
Binary files a/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz and b/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz differ
diff --git a/oraclelinux_6.9/oraclelinux-6.9-rootfs.tar.xz b/oraclelinux_6.9/oraclelinux-6.9-rootfs.tar.xz
index d7a0923..df6b146 100644
Binary files a/oraclelinux_6.9/oraclelinux-6.9-rootfs.tar.xz and b/oraclelinux_6.9/oraclelinux-6.9-rootfs.tar.xz differ
diff --git a/oraclelinux_7-slim/oraclelinux-7-slim-rootfs.tar.xz b/oraclelinux_7-slim/oraclelinux-7-slim-rootfs.tar.xz
index 22adc73..d679062 100644
Binary files a/oraclelinux_7-slim/oraclelinux-7-slim-rootfs.tar.xz and b/oraclelinux_7-slim/oraclelinux-7-slim-rootfs.tar.xz differ
diff --git a/oraclelinux_7.4/oraclelinux-7.4-rootfs.tar.xz b/oraclelinux_7.4/oraclelinux-7.4-rootfs.tar.xz
index 10d4bc1..c93a101 100644
Binary files a/oraclelinux_7.4/oraclelinux-7.4-rootfs.tar.xz and b/oraclelinux_7.4/oraclelinux-7.4-rootfs.tar.xz differ
diff --git a/oraclelinux_7.4/oraclelinux-7.4-rootfs.tar.xz  'tar -t' b/oraclelinux_7.4/oraclelinux-7.4-rootfs.tar.xz  'tar -t'
index b553135..e927e14 100644
--- a/oraclelinux_7.4/oraclelinux-7.4-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_7.4/oraclelinux-7.4-rootfs.tar.xz  'tar -t'	
@@ -1288,7 +1288,7 @@
 ./usr/lib64/libaudit.so.1.0.0
 ./usr/lib64/libauparse.so.0
 ./usr/lib64/libauparse.so.0.0.0
-./usr/lib64/libbfd-2.25.1-31.base.el7.so
+./usr/lib64/libbfd-2.25.1-32.base.el7_4.1.so
 ./usr/lib64/libblkid.so.1
 ./usr/lib64/libblkid.so.1.1.0
 ./usr/lib64/libBrokenLocale-2.17.so
@@ -1489,7 +1489,7 @@
 ./usr/lib64/libnssutil3.so
 ./usr/lib64/libomapi.so.0
 ./usr/lib64/libomapi.so.0.0.0
-./usr/lib64/libopcodes-2.25.1-31.base.el7.so
+./usr/lib64/libopcodes-2.25.1-32.base.el7_4.1.so
 ./usr/lib64/libp11-kit.so.0
 ./usr/lib64/libp11-kit.so.0.3.0
 ./usr/lib64/libpamc.so.0
@@ -4324,6 +4324,7 @@
 ./usr/lib/dracut/dracut.conf.d/
 ./usr/lib/dracut/dracut.conf.d/01-dist.conf
 ./usr/lib/dracut/dracut.conf.d/50-nss-softokn.conf
+./usr/lib/dracut/dracut.conf.d/76-phys-port-name.conf
 ./usr/lib/dracut/dracut-functions
 ./usr/lib/dracut/dracut-functions.sh
 ./usr/lib/dracut/dracut-initramfs-restore
@@ -5526,6 +5527,7 @@
 ./usr/lib/udev/hwdb.d/72-mouse.hwdb
 ./usr/lib/udev/hwdb.d/72-pointingstick.hwdb
 ./usr/lib/udev/mtd_probe
+./usr/lib/udev/phys-port-name-gen
 ./usr/lib/udev/rename_device
 ./usr/lib/udev/rules.d/
 ./usr/lib/udev/rules.d/100-balloon.rules
@@ -5558,6 +5560,7 @@
 ./usr/lib/udev/rules.d/75-net-description.rules
 ./usr/lib/udev/rules.d/75-probe_mtd.rules
 ./usr/lib/udev/rules.d/75-tty-description.rules
+./usr/lib/udev/rules.d/76-phys-port-name.rules
 ./usr/lib/udev/rules.d/78-sound-card.rules
 ./usr/lib/udev/rules.d/80-drivers.rules
 ./usr/lib/udev/rules.d/80-net-name-slot.rules

@tianon
Copy link
Member

tianon commented Sep 30, 2017

LGTM

Build test of #3518; c4074dc (oraclelinux):

$ bashbrew build oraclelinux:7-slim
Building bashbrew/cache:85a2c490f4d697f3b719b83224226576abea17412ca61fd0ace5aa824b9f4842 (oraclelinux:7-slim)
Tagging oraclelinux:7-slim

$ test/run.sh oraclelinux:7-slim
testing oraclelinux:7-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:latest
Building bashbrew/cache:b018336d9430df8a2a9b3d25d33cfee6c162336f31edcf2173d3c27d92ca2704 (oraclelinux:latest)
Tagging oraclelinux:latest
Tagging oraclelinux:7
Tagging oraclelinux:7.4

$ test/run.sh oraclelinux:latest
testing oraclelinux:latest
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:7.3
Building bashbrew/cache:ecc7ce6203a279bb80d8b0c9e4a15b0a73f5ec8b14b8043c6a95b9f40641143e (oraclelinux:7.3)
Tagging oraclelinux:7.3

$ test/run.sh oraclelinux:7.3
testing oraclelinux:7.3
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:7.2
Building bashbrew/cache:6e86edadf86e2c7c62f1727432cb46006bc3e1250a8d50cb1e884395eb95000d (oraclelinux:7.2)
Tagging oraclelinux:7.2

$ test/run.sh oraclelinux:7.2
testing oraclelinux:7.2
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:7.1
Building bashbrew/cache:bd7454b79fc87592da4d981d0ea5e8e10b7c7605eac4e5c4ed35331fceb88944 (oraclelinux:7.1)
Tagging oraclelinux:7.1

$ test/run.sh oraclelinux:7.1
testing oraclelinux:7.1
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:7.0
Building bashbrew/cache:b8cd9f7d2b1d63911a90e9e2068fcdb8dbc3d6f50e48460fcf351ed50547eb93 (oraclelinux:7.0)
Tagging oraclelinux:7.0

$ test/run.sh oraclelinux:7.0
testing oraclelinux:7.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:6-slim
Building bashbrew/cache:d0611694cf5736bb8558f9442e0407a284aecc65f60d59c3b21dd3fa160dae84 (oraclelinux:6-slim)
Tagging oraclelinux:6-slim

$ test/run.sh oraclelinux:6-slim
testing oraclelinux:6-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:6
Building bashbrew/cache:3eae8b8d39b01a55f5dfad7d4e96bdb06e7b40aa01e635c52f4e1b5b494bee6c (oraclelinux:6)
Tagging oraclelinux:6
Tagging oraclelinux:6.9

$ test/run.sh oraclelinux:6
testing oraclelinux:6
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:6.8
Building bashbrew/cache:0b15f157f956af38fd2a3cbdfe56c26fd182e4538ddd91bd244bd1557acd06a2 (oraclelinux:6.8)
Tagging oraclelinux:6.8

$ test/run.sh oraclelinux:6.8
testing oraclelinux:6.8
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:6.7
Building bashbrew/cache:891248fe29d8788fdfdad5f780b067999b24c619634d99d2735e828284b9e3d3 (oraclelinux:6.7)
Tagging oraclelinux:6.7

$ test/run.sh oraclelinux:6.7
testing oraclelinux:6.7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:6.6
Building bashbrew/cache:554294525a6fe77e356d2dadde7a57c9786c88d9c75dad2ebd1e693cf09ceab2 (oraclelinux:6.6)
Tagging oraclelinux:6.6

$ test/run.sh oraclelinux:6.6
testing oraclelinux:6.6
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit 17735f5 into docker-library:master Sep 30, 2017
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.

3 participants