Makefile.am | 1 1 + 0 - 0 !
configure.ac | 4 2 + 2 - 0 !
libblkid/blkid.pc.in | 1 1 + 0 - 0 !
libmount/mount.pc.in | 1 1 + 0 - 0 !
libuuid/uuid.pc.in | 1 1 + 0 - 0 !
5 files changed, 6 insertions(+), 2 deletions(-)

 multiarch support in util-linux build

Addresses-Debian-Bug: 631175
Signed-off-by: LaMont Jones <lamont@debian.org>

Conflicts:
	debian/control
	debian/libblkid-dev.files
	debian/libblkid1.files
	debian/libmount-dev.files
	debian/libmount1.files
	debian/libuuid1.files
	debian/rules
	debian/uuid-dev.files

disk-utils/cfdisk.8 | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 cfdisk.8: mention slang next to curses. closes: #295487

Conflicts:
	fdisk/cfdisk.8

sys-utils/hwclock.8 | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 man page tweaks, cleanup my_dev_t.h ancient stuff

Conflicts:
	getopt/getopt.1
	mount/my_dev_t.h

sys-utils/hwclock.c | 10 10 + 0 - 0 !
1 file changed, 10 insertions(+)

 disable the fallback clause in hwclock when /dev/rtc cannot be
 opened.

hwclock should not access the x86 RTC using I/O instructions unless explicitly
requested from the command line (--directisa). This issue was encountered
while debugging a boot time race when hwclock.sh was run in parallel.

Addresses-Ubuntu-Bug: 274402
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: LaMont Jones <lamont@debian.org>

Conflicts:
	hwclock/hwclock.c

tests/Makemodule.am | 2 1 + 1 - 0 !
tests/functions.sh | 11 11 + 0 - 0 !
2 files changed, 12 insertions(+), 1 deletion(-)

 verbose-tests

Enable verbose tests and print content of failing tests output file.

po/util-linux.pot | 82 46 + 36 - 0 !
1 file changed, 46 insertions(+), 36 deletions(-)

 update pot file

po/ca.po | 82 46 + 36 - 0 !
po/cs.po | 82 46 + 36 - 0 !
po/da.po | 82 46 + 36 - 0 !
po/de.po | 82 46 + 36 - 0 !
po/es.po | 82 46 + 36 - 0 !
po/et.po | 82 46 + 36 - 0 !
po/eu.po | 82 46 + 36 - 0 !
po/fi.po | 82 46 + 36 - 0 !
po/fr.po | 82 46 + 36 - 0 !
po/gl.po | 82 46 + 36 - 0 !
po/hr.po | 82 46 + 36 - 0 !
po/hu.po | 82 46 + 36 - 0 !
po/id.po | 82 46 + 36 - 0 !
po/it.po | 82 46 + 36 - 0 !
po/ja.po | 82 46 + 36 - 0 !
po/nl.po | 82 46 + 36 - 0 !
po/pl.po | 82 46 + 36 - 0 !
po/pt_BR.po | 82 46 + 36 - 0 !
po/ru.po | 82 46 + 36 - 0 !
po/sl.po | 82 46 + 36 - 0 !
po/sv.po | 82 46 + 36 - 0 !
po/tr.po | 82 46 + 36 - 0 !
po/uk.po | 82 46 + 36 - 0 !
po/vi.po | 82 46 + 36 - 0 !
po/zh_CN.po | 82 46 + 36 - 0 !
po/zh_TW.po | 82 46 + 36 - 0 !
26 files changed, 1196 insertions(+), 936 deletions(-)

 update po files

po/de.po | 90 67 + 23 - 0 !
1 file changed, 67 insertions(+), 23 deletions(-)

 update german translation

po/es.po | 1500 900 + 600 - 0 !
1 file changed, 900 insertions(+), 600 deletions(-)

 update spanish translation

po/fr.po | 12 7 + 5 - 0 !
1 file changed, 7 insertions(+), 5 deletions(-)

 update french translation

po/uk.po | 9 4 + 5 - 0 !
1 file changed, 4 insertions(+), 5 deletions(-)

 update ukrainian translation

po/pt_BR.po | 7 3 + 4 - 0 !
1 file changed, 3 insertions(+), 4 deletions(-)

 update brazilian portuguese translation

po/zh_CN.po | 1187 499 + 688 - 0 !
1 file changed, 499 insertions(+), 688 deletions(-)

 update chinese (simplified) translation

po/da.po | 1536 742 + 794 - 0 !
1 file changed, 742 insertions(+), 794 deletions(-)

 update danish translation

po/fi.po | 173 71 + 102 - 0 !
1 file changed, 71 insertions(+), 102 deletions(-)

 update finnish translation

po/ja.po | 459 418 + 41 - 0 !
1 file changed, 418 insertions(+), 41 deletions(-)

 update japanese translation

po/ru.po | 11377 5367 + 6010 - 0 !
1 file changed, 5367 insertions(+), 6010 deletions(-)

 update russian translation

po/cs.po | 3 1 + 2 - 0 !
po/nl.po | 3 1 + 2 - 0 !
po/pl.po | 3 1 + 2 - 0 !
po/vi.po | 3 1 + 2 - 0 !
po/zh_CN.po | 3 1 + 2 - 0 !
5 files changed, 5 insertions(+), 10 deletions(-)

 trivial unfuzzy

libblkid/src/read.c | 21 18 + 3 - 0 !
libblkid/src/save.c | 22 21 + 1 - 0 !
misc-utils/blkid.8 | 5 4 + 1 - 0 !
misc-utils/blkid.c | 4 2 + 2 - 0 !
4 files changed, 45 insertions(+), 7 deletions(-)

 libblkid: care about unsafe chars in cache

The high-level libblkid API uses /run/blkid/blkid.tab cache to
store probing results. The cache format is

   <device NAME="value" ...>devname</device>

and unfortunately the cache code does not escape quotation marks:

   # mkfs.ext4 -L 'AAA"BBB'

   # cat /run/blkid/blkid.tab
   ...
   <device ... LABEL="AAA"BBB" ...>/dev/sdb1</device>

such string is later incorrectly parsed and blkid(8) returns
nonsenses. And for use-cases like

   # eval $(blkid -o export /dev/sdb1)

it's also insecure.

Note that mount, udevd and blkid -p are based on low-level libblkid
API, it bypass the cache and directly read data from the devices.

The current udevd upstream does not depend on blkid(8) output at all,
it's directly linked with the library and all unsafe chars are encoded by
\x<hex> notation.

   # mkfs.ext4 -L 'X"`/tmp/foo` "' /dev/sdb1
   # udevadm info --export-db | grep LABEL
   ...
   E: ID_FS_LABEL=X__/tmp/foo___
   E: ID_FS_LABEL_ENC=X\x22\x60\x2ftmp\x2ffoo\x60\x20\x22

Signed-off-by: Karel Zak <kzak@redhat.com>

include/pathnames.h | 1 1 + 0 - 0 !
sys-utils/unshare.c | 19 19 + 0 - 0 !
2 files changed, 20 insertions(+)

 unshare: fix --map-root-user to work on new kernels

In rare cases droping groups with setgroups(0, NULL) is an operation
that can grant a user additional privileges.  User namespaces were
allwoing that operation to unprivileged users and that had to be
fixed.

Update unshare --map-root-user to disable the setgroups operation
before setting the gid_map.

This is needed as after the security fix gid_map is restricted to
privileged users unless setgroups has been disabled.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>