Merge commit 'origin/stable/v2.14' into stable/v2.14

Conflicts:

mount/Makefile.am

mount: add fallback for versionsort()

I was trying to build util-linux-ng on uclibc and it failed

| lomount.c: In function 'looplist_next':
| lomount.c:223: error: 'versionsort' undeclared (first use in this function)
| lomount.c:223: error: (Each undeclared identifier is reported only once
| lomount.c:223: error: for each function it appears in.)
| make[2]: *** [mount-lomount.o] Error 1
|

which is understood because versionsort is GNU extension and uclibc does
not implement it.

Reported-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: tgets is not in ncurses but in tinfo

ncurses library can be build with terminal related functions
landing in separate libtinfo library. Check for ncurses function
when testing ncurses library existence.

Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>

build-sys: fix dmesg.1 installation

Signed-off-by: Alexey Gladkov <legion@altlinux.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: cleanup sys-utils/Makefile.am

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

hwclock: unshadow a diagnostic printf

- Bogus if test means one message is never produced.

- Avoid needless passing of a global variable (debug).

The --test option flag ought to be a global as well (and perhaps -n/--dry-run).

Signed-off-by: Kalev Soikonen <ksop@hot.ee>

mount: add info about tz=UTC option for FAT to mount.8

CC: Joe Peterson <joe@skyrush.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

sfdisk: print version should end with a newline

Signed-off-by: Denis ChengRq <crquan@gmail.com>

rtcwake: cleanup return codes

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

rtcwake: prefer RTC_WKALM_SET over RTC_ALM_SET

rtcwake: Prefer RTC_WKALM_SET over RTC_ALM_SET, fixing bug with not
waking up with new RTCs.  Also, return error if unable to set the alarm.

Signed-off-by: Gabriel Burt <gburt@novell.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

write: doesn't check for tty group

write(1) selects a wrong tty, because there is not a proper
check of tty group ownership:

$ write kzak
write: kzak is logged in more than once; writing to tty7
write: /dev/tty7: Permission denied

$ ls -la /dev/tty7
crw--w---- 1 root root 4, 7 2008-07-04 00:32 /dev/tty7
                  ^^^^

$ ls -la /usr/bin/write
-rwxr-sr-x 1 root tty 11864 2008-04-02 16:24 /usr/bin/write
      ^           ^^^

We have to check for tty group owner, because we don't have
permissions to write to arbitrary tty.

Fixed version:

$ write kzak
write: kzak is logged in more than once; writing to pts/6
                                                    ^^^^
Message from test@nb on pts/7 at 15:22 ...

^C

$ ls -la /dev/pts/6
crw--w---- 1 kzak tty 136, 6 2008-07-07 15:35 /dev/pts/6
                  ^^^

Addresses-Red-Hat-Bugzilla: #454252
Signed-off-by: Karel Zak <kzak@redhat.com>

umount: improve "-d" option for autoclear loops

The new loop auto-destruct feature detaches automatically loop devices
when no longer used. This means they are detached with the umount()
call. But when we call umount with -d, del_loop() is called and fails
because the ioctl() returns ENXIO. We have to check for autoclear
loop devices rather than blindly call del_loop().

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

selinux: is_selinux_enabled() returns 0, 1 and -1

Unfortunately, the current libselinux implementation of
is_selinux_enabled() returns -1 on error. This behavior is
undocumented.

The proper solution is to use "if (is_selinux_enabled() > 0)".

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

mount: add norealtime to mount.8

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

hwclock: omit warning about drift if --noadjfile given

Currently, if hwclock is given the --noadjfile option it will
nevertheless display information about the drift rate when invoked with
the --debug option.

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

changelog: release

rules: drop separate configure target

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

changelog: release

Merge commit 'v2.14'

build-sys: release++ (v2.14)

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

docs: update v2.14 ReleaseNotes

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

docs: update AUTHORS file

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

po: merge changes

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

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

ddate: 11th, 12th and 13th of month

the Discordian date utility ddate gives the 11th, 12th and 13th of the month as
the "11st", "12nd" and "13rd".  Unless this is a religious thing, please apply
the patch below.

Signed-off-by: Volker Schatz <oss@volkerschatz.com>

rtcwake: fix the default mode to "standby"

Writing "suspend" to /sys/power/state does nothing.
Even "man rtcwake" says that default should be "standby" :)

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Signed-off-by: Karel Zak <kzak@redhat.com>

mount: fix a small typo in mount.8

While working on french translation of the Linux Man Pages, I've found a
small typo in mount.8.

Only one wrong letter : the option "osyncis_o_sync" for XFS filesystem
is erroneously replaced by "osyncis_d_sync" (the previous option).

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

Update menu-item number for Debian Installer components.

Addresses-Debian-Bug: 484407
Signed-off-by: Frans Pop <elendil@planet.nl>
Signed-off-by: LaMont Jones <lamont@debian.org>

changelog: release

control: add support for sh4

This is a patch to support mount, fdisk-udeb and cfdisk-udeb for
SH4 architecture of debian/control.
Please apply.

Addresses-Debian-Bug: 479509
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: LaMont Jones <lamont@debian.org>

meta: fix description of bsdutils.

Based on input from Justin B Rye <jbr@edlug.org.uk>.

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

lomount: initialize sizelimit (lost in merge)

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

changelog: release

Merge commit 'origin/master'

build-sys: release++

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

docs: update 2.14 ReleaseNotes

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

po: merge changes

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

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

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

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

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

docs: we already rewrote the scriptreplay script; remove that TODO entry

Signed-off-by: James Youngman <jay@gnu.org>

mount: remount doesn't care about loop=

The command

   # mount -oremount <spec> <dir>

doesn't read fstab or mtab. This is expected behaviour. Unfortunately,
we have to care about the internal loop= option which is generated and
maintained by mount(8)/umount(8). The loop= option has to be persistent.

How to reproduce this bug:

 # mount -o loop       /home/images/vfat.img /mnt/img; grep vfat /etc/mtab; \
   mount -o remount,ro /home/images/vfat.img /mnt/img; grep vfat /etc/mtab;

 /home/images/vfat.img /mnt/img vfat rw,loop=/dev/loop0 0 0
 /home/images/vfat.img /mnt/img vfat ro 0 0

Reported-By: David Chinner <dgc@sgi.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: add support ionice for Super-H architecture

Addresses-Red-Hat-Bugzilla: #446560
Signed-off-by: Karel Zak <kzak@redhat.com>

fdisk: doesn't recognize the VMware ESX partitions

The fdisk programs do not recognize the partition types used by VMware
ESX.  They show up as "unknown".

Addresses-Red-Hat-Bugzilla: #447023
Signed-off-by: Karel Zak <kzak@redhat.com>

setarch: add fallback for linux/personality

setarch.c:248: error: 'ADDR_NO_RANDOMIZE' undeclared (first use in this function)
setarch.c:248: error: (Each undeclared identifier is reported only once
setarch.c:248: error: for each function it appears in.)
setarch.c:251: error: 'FDPIC_FUNCPTRS' undeclared (first use in this function)
setarch.c:257: error: 'ADDR_COMPAT_LAYOUT' undeclared (first use in this function)
setarch.c:260: error: 'READ_IMPLIES_EXEC' undeclared (first use in this function)

Linux gzp1 2.4.36.1-gzp1 #1 SMP Tue Feb 19 10:23:48 CET 2008 i686 GNU/Linux

Reported-By: Gabor Z. Papp <gzp@papp.hu>
Signed-off-by: Karel Zak <kzak@redhat.com>

changelog: release

Merge branch 'stable/v2.13'

Conflicts:

debian/changelog

changelog: release

Merge commit 'origin/master'

build-sys: release++

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

docs: update v2.14 ReleaseNotes

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

po: merge changes

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

scriptreplay: gettextize a forgotten messages

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

docs: update v2.14 ReleaseNotes

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

ionice: update man page to reflect IDLE class change in  2.6.25

The idle class is safe for non-root users since 2.6.25.
http://lwn.net/Articles/266256/

Addresses-Red-Hat-Bugzilla: #443823
Signed-off-by: Karel Zak <kzak@redhat.com>

Merge branch 'stable/v2.13'

Conflicts:

NEWS
configure.ac
debian/changelog
po/ca.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/et.po
po/eu.po
po/fi.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/nl.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sl.po
po/sv.po
po/tr.po
po/uk.po
po/util-linux-ng.pot
po/vi.po

Merge commit 'origin/master'

changelog Release

Merge commit 'origin/stable/v2.13.1' into stable/v2.13

build-sys: release++ (2.13.1.1)

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

docs: add v2.13.1.1 ReleaseNotes

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

po: merge changes

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

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

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

login: audit log injection attack via login

A while back I found a couple audit log injection attacks which became
CVE-2007-3102. I forgot to look at login to see if its vulnerable and Mirek
found that it is. To verify the problem, type:

root addr=xyz.com

for the account name while logging in. It will look like root logged in with
an address of xyz.com.

Signed-off-by: Steve Grubb <sgrubb@redhat.com>

login: audit log injection attack via login

A while back I found a couple audit log injection attacks which became
CVE-2007-3102. I forgot to look at login to see if its vulnerable and Mirek
found that it is. To verify the problem, type:

root addr=xyz.com

for the account name while logging in. It will look like root logged in with
an address of xyz.com.

Signed-off-by: Steve Grubb <sgrubb@redhat.com>

changelog: release

Merge branch 'stable/v2.13'

control: standards-version 3.7.3.0

Signed-off-by: LaMont Jones <lamont@debian.org>

Merge branch 'stable/v2.13'

control: drop -1 version from libslang2-dev build-dep

Signed-off-by: LaMont Jones <lamont@debian.org>

changelog: release?

Merge commit 'origin/master'

docs: remove date from ReleasNotes

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

docs: update v2.14-ReleaseNotes

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

docs: update AUTHORS file

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

cal: use HAVE_LIB{NCURSES,NCURSESW} instead HAVE_NCURSES

The HAVE_NCURSES is obsolete macro. The autotool generates HAVE_LIBxxx macros.

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

more: use HAVE_WIDECHAR instead ENABLE_WIDECHAR

This problem has been detected by tools/codecheck-config.

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

po: merge changes

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

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

build-sys: remove unnecessary check-local target from login-utils/

We have all tests in the tests/ directory.

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

mkswap: set errno=0 in write_all()

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

setarch: provide backwards compatibility

The getopt_long(3) use introduced by commit
8df90dec2bfd8c876ddd4cea010f40550d4e24aa
broke backwards compatibility.

Old behavior:
$ i386 uname -m
i686

New behavior:
$ i386 uname -m
i386: invalid option -- m
Linux

Traditional method to fix it is to disable program arguments reordering
by prefixing getopt_long's optstring with '+' character.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

Merge commit 'origin/master'

Conflicts:

mount/lomount.c
mount/lomount.h
mount/mount.c

Merge branch 'stable/v2.13'

losetup: fix typo in losetup.8

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

docs: add note about losetup --sizelimit to ReleaseNotes

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

chfn, chsh, login: collapsing three similar messages into a single one

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

losetup: split help message into two smaller parts

As it has already changed since the previous release, take the opportunity
to cut it into two more manageable chunks for translators.

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

swapon: fix swsuspend detection

Welcome to hell where S1SUSPEND/S2SUSPEND is

  "swsuspend" in libblkid

and

  "suspend" in libvolume_id

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

mount: fix typo in mount.8

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

losetup: mark the option -s as deprecated

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

mount: add support for sizelimit= mount option (for loop mounts)

[kzak@redhat.com: split the original patch to small patches]
Signed-off-by: Shachar Shemesh <shachar@lingnu.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

losetup: add --sizelimit option

[kzak@redhat.com: split the original patch to small patches]
Signed-off-by: Shachar Shemesh <shachar@debian.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

changelog: release

mkswap: when writing the signature page, handle EINTR returns

If the signature page write bumps into EINTR, it should finish the
write, instead of dying.

Addresses-Ubuntu-Bug: 206113
Signed-off-by: LaMont Jones <lamont@canonical.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

Revert "mkswap: when writing the signature page, handle EINTR returns."

This reverts commit 5a913db9576f87ae9780d22de7d7f614e7f53dda.

mkswap: when writing the signature page, handle EINTR returns

If the signature page write bumps into EINTR, it should finish the
write, instead of dying.

Addresses-Ubuntu-Bug: 206113
Signed-off-by: LaMont Jones <lamont@canonical.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: update .gitignore files

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