Last commit made on 2015-08-05
Get this branch:
git clone -b ubuntu/vivid-devel https://git.launchpad.net/ubuntu/+source/util-linux
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

a6df108... by Adam Conrad on 2015-08-04

Import patches-unapplied version 2.25.2-4ubuntu3 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 451d785e17af0f1f571f1b0245b7df3a097b944d

New changelog entries:
  * Backport from 2.26.2-6ubuntu1 to take over fdisk on PPC (LP: #1473934)
    - debian/util-linux.install,util-linux.manpages: Ship fdisk on PPC.
    - debian/control: Break old versions of pmac-fdisk with symlinks.

451d785... by Michael Vogt on 2015-02-03

Import patches-unapplied version 2.25.2-4ubuntu2 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 1ad3ba12b139d662500fa54a51875f88f0dae0a4

New changelog entries:
  * Add missing libudev-dev build-dependency. This makes the "LABEL"
    information of lsblk available for non-root users
    (closes: #776905)

1ad3ba1... by Martin Pitt on 2014-12-15

Import patches-unapplied version 2.25.2-4ubuntu1 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: d2d3866313658a99821e27e25e3f5334aceac401

New changelog entries:
  * Merge from Debian unstable. Remaining changes:
    - Regularly trim SSDs automatically (core-1311-ssd-trimming):
      + Add debian/fstrim-all.cron: Call fstrim --all. Installed as
    - Upstart support:
      + Add hwclock{-save}.upstart, and install them in debian/rules.
      + Drop debian/hwclock.rules and hwclock.default.
    - Add mountall-options.patch, see patch header.
    - Add debian/libblkid1.maintscript to clean up /etc/blkid.conf on upgrade.
      This needs to be kept until after Ubuntu 16.04 LTS.

d2d3866... by Andreas Henriksson on 2014-12-12

Import patches-unapplied version 2.25.2-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 2e5d3870ed9cb2bc59eb55d3b395e09d0ae8acf4

New changelog entries:
  [ David PrĂ©vot ]
  * Update POT and PO files and clean up .gmo files
  * Update German translation, thanks to Mario Blättermann
  * Update Spanish translation, thanks to Antonio Ceballos Roa
  * Update French translation (Closes: #770506)
  * Update Ukrainian translation, thanks to Yuri Chornoivan
  * Update Brazilian Portuguese translation, thanks to Rafael Ferreira
  * Update Chinese (simplified) translation, thanks to Wylmer Wang
  * Update Danish translation, thanks to Joe Hansen
  * Update Finnish translation, thanks to Lauri Nurmi
  * Update Japanese translation, thanks to Takeshi Hamasaki
  * Update Russian translation, thanks to Pavel Maryanov
  * Trivial unfuzzy
  [ Andreas Henriksson ]
  * Add debian/patches/libblkid-care-about-unsafe-chars-in-cache.patch
    - from upstream git master commit 89e90ae7
      "libblkid: care about unsafe chars in cache"
    - This fixes CVE-2014-9114: blkid command injection
      see https://security-tracker.debian.org/tracker/CVE-2014-9114
    Thanks to Salvatore Bonaccorso (Closes: #771274)
  * libuuid1: add passwd dependency for user migration (Closes: #771092)

2e5d387... by Andreas Henriksson on 2014-11-06

Import patches-unapplied version 2.25.2-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 290368b78001be6f2fa1479b70f7ab012aa24b58

New changelog entries:
  * Ship fstrim timer/service units as examples only (Closes: #767194)
    - this works around #757891 and #767429 / #760168

290368b... by Andreas Henriksson on 2014-10-24

Import patches-unapplied version 2.25.2-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 588feafbb22f6f89a3e22ce553193674c31ac7fa

New changelog entries:
  * Only ship fstrim service and timer on linux
  * Imported Upstream version 2.25.2
    (Closes: #586179, #765306, #594005, #766077, #764331)
  * Rebase patch queue on top of v2.25.2
    - This drops the following patches now included upstream:
  * Ship fstrim service and timer

588feaf... by Andreas Henriksson on 2014-10-15

Import patches-unapplied version 2.25.1-5 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9d60cd7c4f62dcc9b7f38b5ba03422f90e50c341

New changelog entries:
  * Add debian/patches/build-sys-check-for-libtoolize-rather-than-libtool.patch
    - Cherry-picked from upstream commit e71b0aadaa20b21e9
      "build-sys: check for libtoolize rather than libtool"
    Thanks to Helmut Grohne for fixing this upstream (and more).
    (Closes: #764387)
  * Add debian/patches/script-may-be-hangs.patch
    - Cherry-picked from upstream commit 032228c9af6fbda5177c
      "script: may be hangs" (Closes: #764547)

9d60cd7... by Andreas Henriksson on 2014-10-11

Import patches-unapplied version 2.25.1-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: aebee425c086a092bffaeadc7cc478ac57dad578

New changelog entries:
  [ Sebastian Ramacher ]
  * Use usermod instead of chsh in postinst user migration (Closes: #764244)
  [ Andreas Henriksson ]
  * Use a single usermod call in postinst user migration
  * Silence the attempt to stop uuidd before migration (Closes: #764159)
  [ Helmut Grohne ]
  * Pass -std=gnu99 to CC when cross-building. (Closes: #764392)
  [ Andreas Henriksson ]
  * Add debian/patches/libmount-fix-mnt_is_readonly-ifdef.patch
    - Cherry-picked from upstream commit 473c5fb86c43eed
      "libmount: fix mnt_is_readonly() #ifdef"
    - Fixes Hurd build failure.
    Thanks to Pino Toscano for fixing this upstream! (Closes: #764418)
  * hwclock-set: use both systz and hctosys.
    Thanks to Ben Hutchings for debugging this. (Closes: #764552)
  * Add debian/patches/flock-zero-timeout-is-valid.patch
    - Cherry-picked from upstream commit c4604c38b503c8c46e
      "flock: zero timeout is valid" (Closes: #764660)
  * Trigger update of initramfs on upgrades

aebee42... by Andreas Henriksson on 2014-10-05

Import patches-unapplied version 2.25.1-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: dc504021c2bab879464b05d5aa65c6b04305879a

New changelog entries:
  [ Ben Hutchings ]
  * hwclock-set: Don't use 'touch' to create stamp file, as it may not be
    included in an initramfs (Really closes: #763823)
  [ Andreas Henriksson ]
  * Put uuid-runtime in Section utils.
    Thanks to Ben Finney for the suggestion (Closes: #764039)
  * Cherry-pick upstream commit 8026fa9bc752
    "build-sys: use -lutil for BSD only"
  * Upload to unstable.

dc50402... by Andreas Henriksson on 2014-10-03

Import patches-unapplied version 2.25.1-2 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 03f53b65df1cf16fd7a4d45da35742c77767601c

New changelog entries:
  [ Andreas Henriksson ]
  * Make libmount-dev depend on libblkid-dev (LP: #1096581)
  * Drop uuid-dev dependency in libmount-dev package
  * Drop explicit disabling of pivot_root on non-linux
  * Attempt to stop uuidd before usermod in postinst (LP: #1374648)
  * Change build-dep to new unified libsystemd-dev (Closes: #763808)
  [ Ben Hutchings ]
  * Only set up system clock once (Closes: #763823)