Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2016-05-23 16:39:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docker" Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2016-05-04 08:20:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2016-05-23 16:39:12.000000000 +0200 @@ -1,0 +2,20 @@ +Fri May 20 10:26:39 UTC 2016 - jmassaguerpla@suse.com + +- Fix udev files ownership + +------------------------------------------------------------------- +Wed May 18 14:21:09 UTC 2016 - asarai@suse.de + +* Make sure we *always* build unstripped Go binaries. + +------------------------------------------------------------------- +Mon May 16 13:55:07 UTC 2016 - asarai@suse.de + +* Add a patch to fix database soft corruption issues if the Docker dameon dies + in a bad state. There is a PR upstream to vendor Docker to have this fix as + well, but it probably won't get in until 1.11.2. bnc#964673 + (https://github.com/docker/docker/pull/22765) + + + bnc964673-boltdb-metadata-recovery.patch + +------------------------------------------------------------------- New: ---- bnc964673-boltdb-metadata-recovery.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.dHdJQB/_old 2016-05-23 16:39:13.000000000 +0200 +++ /var/tmp/diff_new_pack.dHdJQB/_new 2016-05-23 16:39:13.000000000 +0200 @@ -57,6 +57,11 @@ # This fixes bsc#976777. While the fix is upstream, it isn't in Docker 1.10.3 or # Docker 1.11.0. This patch was squashed and cherry-picked from runc#708. Patch301: cve-2016-3697-numeric-uid.patch +# This fixes bnc#964673. This fix is in boltdb upstream, but has yet to be +# merged into Docker (in a vendor commit). This patch was cherry-picked from +# bolt#555. +Patch302: bnc964673-boltdb-metadata-recovery.patch +Requires(post): udev BuildRequires: audit BuildRequires: bash-completion BuildRequires: device-mapper-devel >= 1.2.68 @@ -100,6 +105,13 @@ %endif ExcludeArch: ppc +# It's a bad idea to strip Go binaries (apart from making debugging impossible, +# it also is known to cause some interesting runtime bugs). However, rpmbuild +# will strip your binaries if it is creating debuginfo packages (as well as +# doing it by default). So we have to manually disable both of these things. +%undefine _build_create_debug +%define __arch_install_post export NO_BRP_STRIP_DEBUG=true + %description Docker complements LXC with a high-level API which operates at the process level. It runs unix processes with strong guarantees of isolation and @@ -167,6 +179,8 @@ %endif # bsc#976777 %patch301 -p1 +# bnc#964673 +%patch302 -p1 cp %{SOURCE7} . %build ++++++ bnc964673-boltdb-metadata-recovery.patch ++++++
From 8f0e47cee034cdc08ca515d98a6733130908fc26 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai
Date: Mon, 16 May 2016 23:53:46 +1000 Subject: [PATCH] db: fix recovery from unsynced metadata
Bolt stores the two latest transactions' metadata, but previously did
not recover from validation failures in the latest by using the second
latest. Fix this by correctly handling validation failures in db.go, as
well as returning the metadata with highest txid which is also valid in
DB.meta().
Signed-off-by: Aleksa Sarai