Merge commit 'origin'

Conflicts:

sys-utils/Makefile.am
sys-utils/setarch.c

build-sys: release++

Increment release number to v2.13

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

docs: update ReleaseNotes

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

docs: update and sort AUTHORS file

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

po: update po/ stuff

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

ionice: clean up error handling

Print error in case execvp fails and use exit macros.

Based on patch by Bernhard Voelker <mail@bernhard-voelker.de>

Signed-off-by: Matthias Koenig <mkoenig@suse.de>
Signed-off-by: Karel Zak <kzak@redhat.com>

cytune: make the oneliner more specific the cyclades hw in question

See http://bugs.debian.org/375150

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

docs: update TODO

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

setarch: add --3gb option fot compatibility with Debian linux{32,64} command

Debian had a pre-existing linux{32,64} command which supported only
--3gb and --4gb. Adding support for those options allows setarch to
replace that package.

(Note that long options are expected for all setarch flags in the next
release.)

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

setarch: finish adding parisc support

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

change the name in configure.ac back to "util-linux-ng"

changelog

Merge commit 'origin'

Conflicts:

schedutils/Makefile.am
sys-utils/setarch.c

docs: update AUTHORS file

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

Revert "mount: improve error message when helper program not present"

This reverts commit f8988ebf89c65b624ee19c685d15cab6c77fd9df that
breaks new PO translation. The code is currently in "string freeze"
state. The patch will be applied to 2.14 and 2.13.1.

changelog

Revert "umount: only call update_mtab if mtab_is_writable()."

This reverts commit 4279d8b105d3dfcafcf6d190c8f6fd60a14eaece.

There is a check at the top of update_mtab() that makes this unnecessary.

changelog

po: update sv.po (from translationproject.org)

po: update cs.po (from translationproject.org)

taskset: check for existence of sched_getaffinity

Some architectures do no reliably provide sched_getaffinity, so make sure the
define exists before we try using it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

setarch: add parisc/parisc64 support

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

mount: free loop device on failure

Testcase:
$ mount -oloop /etc/group /mnt
ioctl: LOOP_CLR_FD: Device or resource busy
mount: you must specify the filesystem type
$ losetup /dev/loop0
/dev/loop0: [0803]:1931929 (/etc/group)

Signed-off-by: Matthias Koenig <mkoenig@suse.de>

build: /usr/bin/rename needs to be an alternative.  Closes: #439647

build: fdisk (and therefore the udebs) do not get built on m68k.

debian/rules: cleanup and support nostrip option

control: add vcs-* fields to source

metadata: reorder fields in debian/control

build: build-dep lsb-release

typo

changelog

build: switch back to libblkid-dev for Debian.  Closes: #439617

taskset: Don't deliver taskset on m68k.

m68k doesn't have SYS_sched_getaffinity and friends, so taskset not only
makes no sense, it fails to build.

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

umount: only call update_mtab if mtab_is_writable().

There are several calls to update_mtab() which are not guarded by
mtab_is_writable().  Reported by: Daniel Jacobowitz <dan@debian.org>

See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=338803

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

build: finish replacing linux32

- put the man pages where it thinks they belong
- util-linux now Conflicts/Provides: linux32

setarch: also deliver man page links for all the variants

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

build: convert to debhelper, deliver more stuff that was being built.

mount: avoid duplicates for root fs in mtab

If the root fs is defined with LABEL or UUID in fstab, avoid
a duplicate entry in mtab when calling mount without existing
mtab.
A mount -f / creates two entries, one for LABEL and another
for the devicename, because canonicalize does not expand the
LABEL or UUID tags.

Signed-off-by: Matthias Koenig <mkoenig@suse.de>

changelog

setarch: Add SETARCH_LINKS for parisc, too.

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

control: extend package descriptions

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

cytune.8: make the oneliner more specific the cyclades hw in question

See http://bugs.debian.org/375150

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

copyright: document git repository location

release 2.13~rc3-6

Merge commit 'd76ec69bd75e039ecc7eddaca265fc6a49e2a472'

Fixing setarch.

Conflicts:

sys-utils/setarch.c

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

setarch: add parisc/parisc64 support

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

changelog

build: deliver setarch

copyright: migrate copyright changes from README.licensing

setarch: add parisc/parisc64 support

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

Merge commit 'origin'

setarch: cleanup licensing note

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

docs: update AUTHORS file

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

po: update vi.po (from translationproject.org)

Signed-off-by: Phan Vinh Thinh <teppi82@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

po: update nl.po (from translationproject.org)

Signed-off-by: Benno Schulenberg <benno@vertaalt.nl>
Signed-off-by: Karel Zak <kzak@redhat.com>

setarch: add __alpha__ support

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

setarch: add sparc32bash alias to keep compatibility with sparc32

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
Signed-off-by: Karel Zak <kzak@redhat.com>

docs: add DEPRECATED to EXTRA_DIST

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

metadata: Essential packages need to Pre-Depend on their libs.

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

metadata: had multiple depends: lines

slang: switch back to slang2

changelog

hwclock.sh: correct message

build: can't strip perl scripts.
build: deliver flock and flock.1.  Closes: #435272

sfdisk: allow partitioning drives of over 2^31 sectors.

sfdisk would incorrectly complain that there was no room when partitioning
a drive over 2^31 sectors in size.

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

changelog

build: Deliver the right scriptreplay.  Closes: #438771

changelog

drop arch.1 man page as well.

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

docs: fix BSD licence name in README.licensing

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

docs: fix authorship of 8-bit cleanup agetty patch

The patch:

commit 6a4c63d9d90b24d770f887f8cd89fd20f8378267
Author: Moritz Muehlenhoff <jmm@inutil.org>
Date:   Thu Jul 19 00:29:13 2007 +0200

agetty: 8 bit characters on the Linux console lead to input
corruption

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>
has been posted and committed with wrong "Author" field.

Sorry to Samuel Thibault who is original author of the patch.

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

changelog

Merge commit 'origin'

Conflicts:

schedutils/taskset.1

po: update de.po (from translationproject.org)

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

docs: add note about http://translationproject.org

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

man-pages: cleanup of chrt.1 and taskset.1

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

mount: improve error message when helper program not present

"missing codepage" is a bit confusing to many people, so include
"helper program" in the error message when we fail to mount something.

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

changelog, and fix rules check for distro

mount: Use Breaks: control file syntax where possible, instead of preinst.

finish merge from ubuntu-v2.13 to master, release

build: merge ubuntu and debian trees, do the right thing at build time
And yes, udev versions differ, so ubuntu's build-depends are a tad broken.  bummer.

control: Depend, not Pre-Depend.  Transition to libc5 is _LONG_ over.

Merge branch 'master' into ubuntu-v2.13

changelog

copyright: reflect README.licensing

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

Merge commit 'origin'

changelog

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

manpages: cleanup of chrt.1 and taskset.1

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

po: gettextizing some overlooked messages.

Gettextize three new strings, make two strings indentical to two others,
and gettextize three strings that are already gettextized elsewhere.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: add --disable-makeinstall-chown

A chown-like operations are unexpected when you execute "make install"
as non-root user. For example RPM defines owner+permissions in .spec
file -- you needn't to use root account to create useful RPM package.

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

docs: add README.licensing

There is not only one unique license for all code in utl-linux-ng. We
have mix of utils with Public Domain, BSD, GPLv2 or GPLv2+. This thing
should be more transparent to avoid misunderstanding.

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

tests: fix ULONG_MAX usage on 32bit machines

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

chsh: don't use empty shell field in /etc/passwd

chsh(1) uses empty shell setting (pw->pw_shell="") as a synonym for
/bin/sh. This convention is silly and unnecessary. (The vsftpd server
will not run if the shell assigned to user "ftp" is a null string --
according to bug rh#103004).

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

more: fix underlining for multibyte chars

Try:
$ printf "aaa _\bŽ_\bŽ_\bŽ bbb\n" | more
aaa ŽŽŽ bbb

(ŽŽŽ has to be three underlined chars on terminal).

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

login: replace /usr/spool/mail with /var/spool/main in man page

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

Merge branch 'master' into ubuntu-v2.13

Conflicts:

debian/changelog

changelog

hwclock.sh: only report hwclock updated if we did that.  Closes: #436873

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

mount: improve error message when helper program not present

Signed-off-by: LaMont Jones <lamont@mmjgroup.com>

build: add lpia support back in

build: add lpia support back in

Merge branch 'master' into ubuntu-v2.13

fix hurd-i386 build-depends

Conflicts:

debian/control