Bug#863222: unblock: bilibop/0.5.2.1

[intrigeri]

Hi,

quidame:
> Version 0.5.2 (currently in testing) is affected
> by a bug [1] with severity "important", which now
> is fixed in version 0.5.2.1 (currently in unstable).

FWIW, this bug was discovered as it affected Tails, and we're shipping
the proposed diff there; it works fine for us :)

Cheers,
-- 
intrigeri

Bug#863222: unblock: bilibop/0.5.2.1

[quidame]

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Hi,

Please unblock package bilibop, as it meets the
following unblock requirements:

Version 0.5.2 (currently in testing) is affected
by a bug [1] with severity "important", which now
is fixed in version 0.5.2.1 (currently in unstable).

The package is optional, and builds fine on all
applicable architectures, as shown there [2].

Also please consider the attached debdiff.

[1] https://bugs.debian.org/861685
[2] https://buildd.debian.org/status/package.php?p=bilibop

unblock bilibop/0.5.2.1

-- System Information:
Debian Release: 8.8
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500,
'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
diff -Nru bilibop-0.5.2/debian/changelog bilibop-0.5.2.1/debian/changelog
--- bilibop-0.5.2/debian/changelog	2017-01-17 00:29:07.0 +0100
+++ bilibop-0.5.2.1/debian/changelog	2017-05-18 17:20:24.0 +0200
@@ -1,3 +1,11 @@
+bilibop (0.5.2.1) unstable; urgency=high
+
+  * bilibop-common:
+- modify underlying_device_from_aufs() to support multiple read-only
+  branches. Closes: #861685.
+
+ -- Yann Amar   Thu, 18 May 2017 15:20:24 +
+
 bilibop (0.5.2) unstable; urgency=low
 
   * bilibop-rules: add brazilian portuguese translation for debconf templates.
diff -Nru bilibop-0.5.2/lib/bilibop/common.sh bilibop-0.5.2.1/lib/bilibop/common.sh
--- bilibop-0.5.2/lib/bilibop/common.sh	2015-12-07 17:19:52.0 +0100
+++ bilibop-0.5.2.1/lib/bilibop/common.sh	2017-05-18 17:17:24.0 +0200
@@ -513,24 +513,31 @@
 # branch of an aufs mountpoint given as argument. We assume that there is only
 # and at least one physical device used to build the aufs (but the directory
 # is not necessarly the mountpoint of this device), other branch(s) being
-# virtual fs.
+# virtual fs. Note that if there are more than one readonly branch, the first
+# block device found wins.
 underlying_device_from_aufs() {
 ${DEBUG} && echo "> underlying_device_from_aufs $@" >&2
-local   dir="$(aufs_readonly_branch "${1}")"
-local   dev="$(device_id_of_file "${dir}")"
-case "${dev}" in
-"")
-;;
-0:*)
-# aufs mounts can't be nested; but this may be btrfs
-dev="$(underlying_device_from_file "${dir}")"
-;;
-*)
-dev="$(device_node_from_major_minor "${dev}")"
-;;
-esac
-
-[ -b "${dev}" ] && readlink -f "${dev}"
+local dev dir
+for dir in $(aufs_readonly_branch "${1}"); do
+dev="$(device_id_of_file "${dir}")"
+case "${dev}" in
+"")
+continue
+;;
+0:*)
+# aufs mounts can't be nested; but this may be btrfs
+dev="$(underlying_device_from_file "${dir}")"
+;;
+*)
+dev="$(device_node_from_major_minor "${dev}")"
+;;
+esac
+if [ -b "${dev}" ]; then
+readlink -f "${dev}"
+return 0
+fi
+done
+return 1
 }
 # ===}}}
 # underlying_device_from_overlayfs() {{{