2.19-1: upgrade to stable release

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

.gitignore

@@ -3,3 +3,4 @@
 /util-linux-2.19-rc1-32-gbded43d.tar.bz2
 /util-linux-2.19-rc2.tar.bz2
 /util-linux-2.19-rc3.tar.bz2
+/util-linux-2.19.tar.bz2

mount.tmpfs

@@ -1,51 +0,0 @@
-#! /bin/bash
-#
-# Copyright (C) 2009 Eric Paris <eparis@redhat.com>
-#                    Daniel Walsh <dwalsh@redhat.com>
-#                    Karel Zak <kzak@redhat.com>
-#
-# http://bugzilla.redhat.com/show_bug.cgi?id=476964
-#
-# Usage:
-# /sbin/mount.tmpfs spec dir [-sfnv] [-o options]
-#
-
-case $1 in
-  -h|--help|-?)
-      echo "mount.tmpfs is a private mount(8) wrapper for tmpfs."
-      echo "Don't use it directly!"
-      exit 1
-      ;;
-esac
-
-restricted=1
-
-if [ $UID -eq 0 ] && [ $UID -eq $EUID ]; then
-  restricted=0
-fi
-
-# mount(8) in restricted mode (for non-root users) does not allow to use any
-# mount options, types or so on command line. We have to call mount(8) with
-# mountpoint only.  All necessary options have to be defined in /etc/fstab.
-#
-# https://bugzilla.redhat.com/show_bug.cgi?id=615719
-#
-if [ $restricted -eq 1 ]; then
-  exec /bin/mount -i "$2"
-fi
-
-# Remount with context mount options is unsupported
-# http://bugzilla.redhat.com/show_bug.cgi?id=563267
-#
-if ! echo "$@" | grep -q -E '\-o.*remount';  then
-
-  if ! echo "$@" | grep -q -E '(fs|def|root)?context='; then
-     con=$(ls --scontext -d "$2" | cut -f 1 -d ' ')
-     if [ -n "$con" ] && [ "$con" != "?" ] && [ "$con" != "unlabeled" ]; then 
-        exec /bin/mount "$@" -o "rootcontext=\"$con\"" -i -t tmpfs
-     fi
-  fi
-
-fi
-
-exec /bin/mount "$@" -i -t tmpfs

sources

@@ -1,2 +1,2 @@
 7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2
-89423502d34bd1e6da0ad29ac716145f  util-linux-2.19-rc3.tar.bz2
+590ca71aad0b254e2631d84401f28255  util-linux-2.19.tar.bz2

util-linux.spec

@@ -2,12 +2,12 @@
 Summary: A collection of basic system utilities
 Name: util-linux
 Version: 2.19
-Release: 0.6%{?dist}
+Release: 1%{?dist}
 License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux
 
-%define upstream_version %{version}-rc3
+%define upstream_version %{version}
 
 ### Features
 %if 0%{?rhel}
@@ -38,7 +38,6 @@ Source1: util-linux-login.pamd
 Source2: util-linux-remote.pamd
 Source3: util-linux-chsh-chfn.pamd
 Source4: util-linux-60-raw.rules
-Source5: mount.tmpfs
 Source8: nologin.c
 Source9: nologin.8
 Source10: uuidd.init
@@ -312,11 +311,6 @@ ln -sf ../../sbin/hwclock ${RPM_BUILD_ROOT}/usr/sbin/hwclock
 ln -sf hwclock ${RPM_BUILD_ROOT}/sbin/clock
 echo ".so man8/hwclock.8" > ${RPM_BUILD_ROOT}%{_mandir}/man8/clock.8
 
-# install tmpfs mount helper
-pushd ${RPM_BUILD_ROOT}/sbin
-install -m 755 %{SOURCE5} ./mount.tmpfs
-popd
-
 # unsupported on ix86 alpha armv4l
 %ifnarch %cytune_archs
 rm -f $RPM_BUILD_ROOT%{_bindir}/cytune $RPM_BUILD_ROOT%{_mandir}/man8/cytune.8*
@@ -489,7 +483,6 @@ fi
 
 %attr(4755,root,root)	/bin/mount
 %attr(4755,root,root)	/bin/umount
-%attr(755,root,root)	/sbin/mount.tmpfs
 %attr(755,root,root)	/bin/login
 %attr(4711,root,root)	%{_bindir}/chfn
 %attr(4711,root,root)	%{_bindir}/chsh
@@ -749,6 +742,12 @@ fi
 
 
 %changelog
+
+* Thu Feb 10 2011 Karel Zak <kzak@redhat.com> 2.19-1
+- upgrade to the release 2.19
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-ReleaseNotes
+- remove /sbin/mount.tmpfs -- integrated to mount(8)
+
 * Tue Feb  8 2011 Karel Zak <kzak@redhat.com> 2.19-0.6
 - fix #665062 - add support for the postlogin PAM stack to util-linux-ng