diff --git a/util-linux.spec b/util-linux.spec
index 70740b3..69a41ca 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -2,7 +2,7 @@
Summary: A collection of basic system utilities
Name: util-linux
Version: 2.37.4
-Release: 9%{?dist}
+Release: 9.1%{?dist}
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
URL: http://en.wikipedia.org/wiki/Util-linux
@@ -70,12 +70,22 @@ Provides: rfkill = 0.5
# sulogin, utmpdump merged into util-linux v2.22;
# last, lastb merged into util-linux v2.24
Conflicts: sysvinit-tools < 2.88-14
+# old versions of e2fsprogs contain fsck, uuidgen
+Conflicts: e2fsprogs < 1.41.8-5
# rename from util-linux-ng back to util-linux
Obsoletes: util-linux-ng < 2.19
Provides: util-linux-ng = %{version}-%{release}
Conflicts: filesystem < 3
-Provides: /sbin/nologin
+Provides: /bin/dmesg
+Provides: /bin/kill
+Provides: /bin/more
+Provides: /bin/mount
+Provides: /bin/umount
+Provides: /sbin/blkid
+Provides: /sbin/blockdev
Provides: /sbin/findfs
+Provides: /sbin/fsck
+Provides: /sbin/nologin
Requires(post): coreutils
Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth
@@ -85,7 +95,6 @@ Requires: libblkid = %{version}-%{release}
Requires: libmount = %{version}-%{release}
Requires: libsmartcols = %{version}-%{release}
Requires: libfdisk = %{version}-%{release}
-Requires: util-linux-core = %{version}-%{release}
### RHEL-9.0.0
@@ -120,7 +129,7 @@ Patch13: 0013-login-utils-logindefs-fix-compiler-warning-Werror-fo.patch
# 2092943 - uuidd time based UUIDs are without MAC address
Patch14: 0014-uuidd-allow-AF_INET-in-systemd-service.patch
Patch15: 0015-uuidd-remove-also-PrivateNetwork-yes-from-systemd-se.patch
-# 2078787 - Activity "lsirq -s column" produces wrong result i.e. not sorting properly.
+# 2078787 - Activity "lsirq -s column" produces wrong result i.e. not sorting properly.
Patch16: 0016-lsirq-improve-sort-IRQ.patch
Patch17: 0017-irqtop-fix-compiler-warning-Werror-format-truncation.patch
# 2076829 - dmesg new option "--since" is not working if timestamp format is not provided
@@ -158,32 +167,6 @@ others, Util-linux contains the fdisk configuration tool and the login
program.
-%package -n util-linux-core
-Summary: The most essential utilities from the util-linux suite.
-License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
-Provides: /bin/dmesg
-Provides: /bin/kill
-Provides: /bin/more
-Provides: /bin/mount
-Provides: /bin/umount
-Provides: /sbin/blkid
-Provides: /sbin/blockdev
-Provides: /sbin/fsck
-# hardlink has been merged into util-linux v2.34
-Obsoletes: hardlink <= 1:1.3-9
-Provides: hardlink = 1:1.3-9
-Requires: libuuid = %{version}-%{release}
-Requires: libblkid = %{version}-%{release}
-Requires: libmount = %{version}-%{release}
-Requires: libsmartcols = %{version}-%{release}
-# old versions of e2fsprogs contain fsck, uuidgen
-Conflicts: e2fsprogs < 1.41.8-5
-
-%description -n util-linux-core
-This is a very basic set of Linux utilities that is necessary on
-minimal installations.
-
-
%package -n libfdisk
Summary: Partitioning library for fdisk-like programs.
License: LGPLv2+
@@ -453,7 +436,7 @@ for I in /sbin/sfdisk \
%{_mandir}/man8/sfdisk.8* \
/sbin/cfdisk \
%{_mandir}/man8/cfdisk.8*; do
-
+
rm -f $RPM_BUILD_ROOT$I
done
%endif
@@ -487,7 +470,7 @@ find $RPM_BUILD_ROOT%{_mandir}/man8 -regextype posix-egrep \
-printf "%{_mandir}/man8/%f*\n" >> %{name}.files
-%post -n util-linux-core
+%post
if [ ! -L /etc/mtab ]; then
ln -sf ../proc/self/mounts /etc/mtab || :
fi
@@ -535,7 +518,7 @@ fi
%files -f %{name}.files
%doc README NEWS AUTHORS
-%doc Documentation/deprecated.txt
+%doc Documentation/deprecated.txt
%{!?_licensedir:%global license %%doc}
%license Documentation/licenses/*
%doc misc-utils/getopt-*.{bash,tcsh}
@@ -549,28 +532,43 @@ fi
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime
+%attr(4755,root,root) %{_bindir}/mount
+%attr(4755,root,root) %{_bindir}/umount
%attr(4755,root,root) %{_bindir}/su
%attr(755,root,root) %{_bindir}/login
%attr(2755,root,tty) %{_bindir}/write
+%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
+
%{_unitdir}/fstrim.*
%{_bindir}/cal
-%{_bindir}/chmem
+%{_bindir}/chrt
%{_bindir}/choom
%{_bindir}/col
%{_bindir}/colcrt
%{_bindir}/colrm
%{_bindir}/column
+%{_bindir}/chmem
+%{_bindir}/dmesg
%{_bindir}/eject
%{_bindir}/fallocate
%{_bindir}/fincore
+%{_bindir}/findmnt
+%{_bindir}/flock
%{_bindir}/getopt
+%{_bindir}/hardlink
%{_bindir}/hexdump
+%{_bindir}/ionice
+%{_bindir}/ipcmk
+%{_bindir}/ipcrm
+%{_bindir}/ipcs
%{_bindir}/irqtop
%{_bindir}/isosize
+%{_bindir}/kill
%{_bindir}/last
%{_bindir}/lastb
+%{_bindir}/logger
%{_bindir}/look
%{_bindir}/lsblk
%{_bindir}/lscpu
@@ -582,17 +580,24 @@ fi
%{_bindir}/lsns
%{_bindir}/mcookie
%{_bindir}/mesg
+%{_bindir}/more
+%{_bindir}/mountpoint
%{_bindir}/namei
+%{_bindir}/nsenter
%{_bindir}/prlimit
%{_bindir}/rename
+%{_bindir}/renice
%{_bindir}/rev
%{_bindir}/script
%{_bindir}/scriptlive
%{_bindir}/scriptreplay
%{_bindir}/setarch
%{_bindir}/setpriv
+%{_bindir}/setsid
%{_bindir}/setterm
+%{_bindir}/taskset
%{_bindir}/ul
+%{_bindir}/unshare
%{_bindir}/utmpdump
%{_bindir}/uuidgen
%{_bindir}/uuidparse
@@ -601,18 +606,28 @@ fi
%{_bindir}/whereis
%{_mandir}/man1/cal.1*
%{_mandir}/man1/choom.1*
+%{_mandir}/man1/chrt.1*
%{_mandir}/man1/col.1*
%{_mandir}/man1/colcrt.1*
%{_mandir}/man1/colrm.1*
%{_mandir}/man1/column.1*
+%{_mandir}/man1/dmesg.1*
%{_mandir}/man1/eject.1*
%{_mandir}/man1/fallocate.1*
%{_mandir}/man1/fincore.1*
+%{_mandir}/man1/flock.1*
%{_mandir}/man1/getopt.1*
+%{_mandir}/man1/hardlink.1*
%{_mandir}/man1/hexdump.1*
+%{_mandir}/man1/ionice.1*
+%{_mandir}/man1/ipcmk.1*
+%{_mandir}/man1/ipcrm.1*
+%{_mandir}/man1/ipcs.1*
%{_mandir}/man1/irqtop.1*
+%{_mandir}/man1/kill.1*
%{_mandir}/man1/last.1*
%{_mandir}/man1/lastb.1*
+%{_mandir}/man1/logger.1*
%{_mandir}/man1/login.1*
%{_mandir}/man1/look.1*
%{_mandir}/man1/lscpu.1*
@@ -622,18 +637,25 @@ fi
%{_mandir}/man1/lsmem.1*
%{_mandir}/man1/mcookie.1*
%{_mandir}/man1/mesg.1*
+%{_mandir}/man1/more.1*
+%{_mandir}/man1/mountpoint.1*
%{_mandir}/man1/namei.1*
+%{_mandir}/man1/nsenter.1*
%{_mandir}/man1/prlimit.1*
%{_mandir}/man1/rename.1*
+%{_mandir}/man1/renice.1*
%{_mandir}/man1/rev.1*
%{_mandir}/man1/runuser.1*
%{_mandir}/man1/script.1*
%{_mandir}/man1/scriptlive.1*
%{_mandir}/man1/scriptreplay.1*
%{_mandir}/man1/setpriv.1*
+%{_mandir}/man1/setsid.1*
%{_mandir}/man1/setterm.1*
%{_mandir}/man1/su.1*
+%{_mandir}/man1/taskset.1*
%{_mandir}/man1/ul.1*
+%{_mandir}/man1/unshare.1*
%{_mandir}/man1/utmpdump.1.gz
%{_mandir}/man1/uuidgen.1*
%{_mandir}/man1/uuidparse.1*
@@ -643,27 +665,36 @@ fi
%{_mandir}/man5/fstab.5*
%{_mandir}/man5/terminal-colors.d.5*
%{_mandir}/man8/addpart.8*
+%{_mandir}/man8/agetty.8*
%{_mandir}/man8/blkdiscard.8*
+%{_mandir}/man8/blkid.8*
%{_mandir}/man8/blkzone.8*
+%{_mandir}/man8/blockdev.8*
%{_mandir}/man8/chcpu.8*
%{_mandir}/man8/chmem.8*
%{_mandir}/man8/ctrlaltdel.8*
%{_mandir}/man8/delpart.8*
%{_mandir}/man8/fdisk.8*
%{_mandir}/man8/findfs.8*
+%{_mandir}/man8/findmnt.8*
+%{_mandir}/man8/fsck.8*
%{_mandir}/man8/fsck.cramfs.8*
%{_mandir}/man8/fsck.minix.8*
%{_mandir}/man8/fsfreeze.8*
%{_mandir}/man8/fstrim.8*
%{_mandir}/man8/isosize.8*
%{_mandir}/man8/ldattach.8*
+%{_mandir}/man8/losetup.8*
%{_mandir}/man8/lsblk.8*
%{_mandir}/man8/lslocks.8*
%{_mandir}/man8/lsns.8*
%{_mandir}/man8/mkfs.8*
%{_mandir}/man8/mkfs.cramfs.8*
%{_mandir}/man8/mkfs.minix.8*
+%{_mandir}/man8/mkswap.8*
+%{_mandir}/man8/mount.8*
%{_mandir}/man8/nologin.8*
+%{_mandir}/man8/partx.8*
%{_mandir}/man8/pivot_root.8*
%{_mandir}/man8/readprofile.8*
%{_mandir}/man8/resizepart.8*
@@ -672,26 +703,37 @@ fi
%{_mandir}/man8/setarch.8*
%{_mandir}/man8/sulogin.8.gz
%{_mandir}/man8/swaplabel.8*
+%{_mandir}/man8/swapoff.8*
+%{_mandir}/man8/swapon.8*
+%{_mandir}/man8/switch_root.8*
+%{_mandir}/man8/umount.8*
%{_mandir}/man8/wdctl.8.gz
%{_mandir}/man8/wipefs.8*
%{_mandir}/man8/zramctl.8*
%{_sbindir}/addpart
+%{_sbindir}/agetty
%{_sbindir}/blkdiscard
+%{_sbindir}/blkid
%{_sbindir}/blkzone
+%{_sbindir}/blockdev
%{_sbindir}/chcpu
%{_sbindir}/ctrlaltdel
%{_sbindir}/delpart
%{_sbindir}/fdisk
%{_sbindir}/findfs
+%{_sbindir}/fsck
%{_sbindir}/fsck.cramfs
%{_sbindir}/fsck.minix
%{_sbindir}/fsfreeze
%{_sbindir}/fstrim
%{_sbindir}/ldattach
+%{_sbindir}/losetup
%{_sbindir}/mkfs
%{_sbindir}/mkfs.cramfs
%{_sbindir}/mkfs.minix
+%{_sbindir}/mkswap
%{_sbindir}/nologin
+%{_sbindir}/partx
%{_sbindir}/pivot_root
%{_sbindir}/readprofile
%{_sbindir}/resizepart
@@ -700,37 +742,54 @@ fi
%{_sbindir}/runuser
%{_sbindir}/sulogin
%{_sbindir}/swaplabel
+%{_sbindir}/swapoff
+%{_sbindir}/swapon
+%{_sbindir}/switch_root
%{_sbindir}/wipefs
%{_sbindir}/zramctl
%{compldir}/addpart
%{compldir}/blkdiscard
+%{compldir}/blkid
%{compldir}/blkzone
+%{compldir}/blockdev
%{compldir}/cal
%{compldir}/chcpu
%{compldir}/chmem
+%{compldir}/chrt
%{compldir}/col
%{compldir}/colcrt
%{compldir}/colrm
%{compldir}/column
%{compldir}/ctrlaltdel
%{compldir}/delpart
+%{compldir}/dmesg
%{compldir}/eject
%{compldir}/fallocate
%{compldir}/fdisk
%{compldir}/fincore
%{compldir}/findfs
+%{compldir}/findmnt
+%{compldir}/flock
+%{compldir}/fsck
%{compldir}/fsck.cramfs
%{compldir}/fsck.minix
%{compldir}/fsfreeze
%{compldir}/fstrim
%{compldir}/getopt
+%{compldir}/hardlink
%{compldir}/hexdump
+%{compldir}/ionice
+%{compldir}/ipcmk
+%{compldir}/ipcrm
+%{compldir}/ipcs
%{compldir}/irqtop
%{compldir}/isosize
%{compldir}/last
%{compldir}/ldattach
+%{compldir}/logger
%{compldir}/look
+%{compldir}/losetup
%{compldir}/lsblk
%{compldir}/lscpu
%{compldir}/lsipc
@@ -744,11 +803,17 @@ fi
%{compldir}/mkfs
%{compldir}/mkfs.cramfs
%{compldir}/mkfs.minix
+%{compldir}/mkswap
+%{compldir}/more
+%{compldir}/mountpoint
%{compldir}/namei
+%{compldir}/nsenter
+%{compldir}/partx
%{compldir}/pivot_root
%{compldir}/prlimit
%{compldir}/readprofile
%{compldir}/rename
+%{compldir}/renice
%{compldir}/resizepart
%{compldir}/rev
%{compldir}/rfkill
@@ -759,10 +824,15 @@ fi
%{compldir}/scriptreplay
%{compldir}/setarch
%{compldir}/setpriv
+%{compldir}/setsid
%{compldir}/setterm
%{compldir}/su
%{compldir}/swaplabel
+%{compldir}/swapoff
+%{compldir}/swapon
+%{compldir}/taskset
%{compldir}/ul
+%{compldir}/unshare
%{compldir}/utmpdump
%{compldir}/uuidgen
%{compldir}/uuidparse
@@ -799,95 +869,6 @@ fi
%endif
-%files -n util-linux-core
-%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
-%attr(4755,root,root) %{_bindir}/mount
-%attr(4755,root,root) %{_bindir}/umount
-%{_bindir}/chrt
-%{_bindir}/dmesg
-%{_bindir}/findmnt
-%{_bindir}/flock
-%{_bindir}/hardlink
-%{_bindir}/ionice
-%{_bindir}/ipcmk
-%{_bindir}/ipcrm
-%{_bindir}/ipcs
-%{_bindir}/kill
-%{_bindir}/logger
-%{_bindir}/more
-%{_bindir}/mountpoint
-%{_bindir}/nsenter
-%{_bindir}/renice
-%{_bindir}/setsid
-%{_bindir}/taskset
-%{_bindir}/unshare
-%{compldir}/blkid
-%{compldir}/blockdev
-%{compldir}/chrt
-%{compldir}/dmesg
-%{compldir}/findmnt
-%{compldir}/flock
-%{compldir}/fsck
-%{compldir}/hardlink
-%{compldir}/ionice
-%{compldir}/ipcmk
-%{compldir}/ipcrm
-%{compldir}/ipcs
-%{compldir}/logger
-%{compldir}/losetup
-%{compldir}/mkswap
-%{compldir}/more
-%{compldir}/mountpoint
-%{compldir}/nsenter
-%{compldir}/partx
-%{compldir}/renice
-%{compldir}/setsid
-%{compldir}/swapoff
-%{compldir}/swapon
-%{compldir}/taskset
-%{compldir}/unshare
-%{_mandir}/man1/chrt.1*
-%{_mandir}/man1/dmesg.1*
-%{_mandir}/man1/flock.1*
-%{_mandir}/man1/hardlink.1*
-%{_mandir}/man1/ionice.1*
-%{_mandir}/man1/ipcmk.1*
-%{_mandir}/man1/ipcrm.1*
-%{_mandir}/man1/ipcs.1*
-%{_mandir}/man1/kill.1*
-%{_mandir}/man1/logger.1*
-%{_mandir}/man1/more.1*
-%{_mandir}/man1/mountpoint.1*
-%{_mandir}/man1/nsenter.1*
-%{_mandir}/man1/renice.1*
-%{_mandir}/man1/setsid.1*
-%{_mandir}/man1/taskset.1*
-%{_mandir}/man1/unshare.1*
-%{_mandir}/man8/agetty.8*
-%{_mandir}/man8/blkid.8*
-%{_mandir}/man8/blockdev.8*
-%{_mandir}/man8/findmnt.8*
-%{_mandir}/man8/fsck.8*
-%{_mandir}/man8/losetup.8*
-%{_mandir}/man8/mkswap.8*
-%{_mandir}/man8/mount.8*
-%{_mandir}/man8/partx.8*
-%{_mandir}/man8/swapoff.8*
-%{_mandir}/man8/swapon.8*
-%{_mandir}/man8/switch_root.8*
-%{_mandir}/man8/umount.8*
-%{_sbindir}/agetty
-%{_sbindir}/blkid
-%{_sbindir}/blockdev
-%{_sbindir}/fsck
-%{_sbindir}/losetup
-%{_sbindir}/mkswap
-%{_sbindir}/partx
-%{_sbindir}/swapoff
-%{_sbindir}/swapon
-%{_sbindir}/switch_root
-
-
%files -n util-linux-user
%config(noreplace) %{_sysconfdir}/pam.d/chfn
%config(noreplace) %{_sysconfdir}/pam.d/chsh
@@ -984,6 +965,9 @@ fi
%{_libdir}/python*/site-packages/libmount/
%changelog
+* Thu Sep 14 2023 Anita Zhang <the.anitazha@gmail.com> 2.37.4-9.1
+- merge util-linux-core back into util-linux
+
* Wed Aug 24 2022 Karel Zak <kzak@redhat.com> 2.37.4-9
- improve lslogins pasword validator (related #2094216)
@@ -1006,7 +990,7 @@ fi
- fix #2092943 - uuidd time based UUIDs are without MAC address
- fix #2074486 - wipefs to erase all available signatures against read only rom
- fix #2064810 - RFE: complete libblkid FSSIZE implementation
-- fix #2078787 - Activity "lsirq -s column" produces wrong result i.e. not sorting properly.
+- fix #2078787 - Activity "lsirq -s column" produces wrong result i.e. not sorting properly.
- fix #2076829 - dmesg new option "--since" is not working if timestamp format is not provided
- fix #2109459 - fix compiler warnings/errors
@@ -1717,7 +1701,7 @@ fi
* Wed Jun 30 2010 Karel Zak <kzak@redhat.com> 2.18-1
- upgrade to the final 2.18
ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ReleaseNotes
-
+
* Fri Jun 18 2010 Karel Zak <kzak@redhat.com> 2.18-0.2
- upgrade to 2.18-rc2
ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-rc2-ChangeLog
@@ -1785,7 +1769,7 @@ fi
* Mon Oct 19 2009 Karel Zak <kzak@redhat.com> 2.17-0.1.git5e51568
- upgrade to pre-release snapshot (official changelog not available yet, see
- http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git for now)
+ http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git for now)
- new commands: fallocate, unshare, wipefs
- libblkid supports topology and partitions probing
- remove support for --rmpart[s] from blockdev(8) (util-linux-ng-2.14-blockdev-rmpart.patch)
@@ -1847,7 +1831,7 @@ fi
* Thu Jun 4 2009 Karel Zak <kzak@redhat.com> 2.15.1-0.1
- upgrade to 2.15.1-rc1
ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-ReleaseNotes
- ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-rc1-ChangeLog
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-rc1-ChangeLog
- merged patches:
util-linux-ng-2.14-login-remote.patch
util-linux-ng-2.14-fdisk-4k-I.patch
@@ -1863,7 +1847,7 @@ fi
* Thu Apr 2 2009 Karel Zak <kzak@redhat.com> 2.14.2-8
- fix #490769 - post scriptlet failed (thanks to Dan Horak)
-
+
* Fri Mar 20 2009 Karel Zak <kzak@redhat.com> 2.14.2-7
- fix some nits in mount.tmpfs
@@ -2037,7 +2021,7 @@ fi
- fix #218915 - fdisk -b 4K
- upgrade to -pre7 release
- fix building problem with raw0 patch
-- fix #217186 - /bin/sh: @MKINSTALLDIRS@: No such file or directory
+- fix #217186 - /bin/sh: @MKINSTALLDIRS@: No such file or directory
(port po/Makefile.in.in from gettext-0.16)
- sync with FC6 and RHEL5:
- fix #216489 - SCHED_BATCH option missing in chrt
@@ -2063,7 +2047,7 @@ fi
* Fri Sep 15 2006 Karel Zak <kzak@redhat.com> 2.13-0.41
- fix #205038 - mount not allowing sloppy option (exports "-s"
- to external /sbin/mount.nfs(4) calls)
+ to external /sbin/mount.nfs(4) calls)
- fix minor bug in util-linux-2.13-mount-twiceloop.patch
- fix #188193- util-linux should provide plugin infrastructure for HAL
@@ -2096,8 +2080,8 @@ fi
* Mon Jul 17 2006 Karel Zak <kzak@redhat.com> 2.13-0.32
- add IPv6 support to the login command (patch by Milan Zazrivec)
-- fix #198626 - add keyinit instructions to the login PAM script
- (patch by David Howells)
+- fix #198626 - add keyinit instructions to the login PAM script
+ (patch by David Howells)
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.13-0.31.1
- rebuild
@@ -2108,7 +2092,7 @@ fi
* Mon Jul 10 2006 Karsten Hopp <karsten@redhat.de> 2.13-0.30
- silence install in minimal buildroot without /var/log
-* Fri Jul 7 2006 Karel Zak <kzak@redhat.com> 2.13-0.29
+* Fri Jul 7 2006 Karel Zak <kzak@redhat.com> 2.13-0.29
- include the raw command for RHELs
* Mon Jun 26 2006 Florian La Roche <laroche@redhat.com> 2.13-0.28
@@ -2130,7 +2114,7 @@ fi
- fix #191230 - using mount --move results in wrong data in /etc/mtab
- added mount subtrees support
- fdisk: wrong number of sectors for large disks (suse#160822)
-- merge fdisk-xvd (#182553) with new fdisk-isfull (#188981) patch
+- merge fdisk-xvd (#182553) with new fdisk-isfull (#188981) patch
- fix #181549 - raw(8) manpage has old information about dd
- remove asm/page.h usage
@@ -2183,7 +2167,7 @@ fi
* Thu Jan 19 2006 Steve Dickson <steved@redhat.com> 2.13-0.14
- Updated the gssd_check() and idmapd_check(), used with
nfsv4 mounts, to looked for the correct file in /var/lock/subsys
- which stops bogus warnings.
+ which stops bogus warnings.
* Tue Jan 3 2006 Karel Zak <kzak@redhat.com> 2.13-0.13
- fix #174676 - hwclock audit return code mismatch
@@ -2299,7 +2283,7 @@ fi
* Fri Feb 25 2005 Steve Dickson <SteveD@RedHat.com> 2.12p-2
- Changed nfsmount to only use reserve ports when necessary
- (bz# 141773)
+ (bz# 141773)
* Thu Dec 23 2004 Elliot Lee <sopwith@redhat.com> 2.12p-1
- Update to util-linux-2.12p. This changes swap header format
@@ -2311,7 +2295,7 @@ fi
* Tue Dec 7 2004 Steve Dickson <SteveD@RedHat.com> 2.12a-20
- Corrected a buffer overflow problem with nfs mounts.
- (bz# 141733)
+ (bz# 141733)
* Wed Dec 01 2004 Elliot Lee <sopwith@redhat.com> 2.12a-19
- Patches for various bugs.
@@ -2407,8 +2391,8 @@ fi
- mkcramfs: use PAGE_SIZE for default blocksize (#118681)
* Sat Mar 20 2004 <SteveD@RedHat.com>
-- Updated the nfs-mount.patch to correctly
- handle the mounthost option and to ignore
+- Updated the nfs-mount.patch to correctly
+ handle the mounthost option and to ignore
servers that do not set auth flavors
* Tue Mar 16 2004 Dan Walsh <dwalsh@RedHat.com> 2.12-13
@@ -2419,7 +2403,7 @@ fi
- Added two checks to the nfs4 path what will print warnings
when rpc.idmapd and rpc.gssd are not running
- Ping NFS v4 servers before diving into kernel
-- Make v4 mount interruptible which also make the intr option on by default
+- Make v4 mount interruptible which also make the intr option on by default
* Sat Mar 13 2004 <SteveD@RedHat.com>
- Reworked how the rpc.idmapd and rpc.gssd checks were
@@ -2440,10 +2424,10 @@ fi
- Tried to make nfs error message a bit more meaninful
- Cleaned up some warnings
-* Sun Mar 7 2004 Steve Dickson <SteveD@RedHat.com>
+* Sun Mar 7 2004 Steve Dickson <SteveD@RedHat.com>
- Added pesudo flavors for nfsv4 mounts.
- Added BuildRequires: libselinux-devel and Requires: libselinux
- when WITH_SELINUX is set.
+ when WITH_SELINUX is set.
* Fri Feb 27 2004 Dan Walsh <dwalsh@redhat.com> 2.12-5
- check for 2.6.3 kernel in mount options
@@ -2472,7 +2456,7 @@ fi
* Thu Jan 15 2004 Elliot Lee <sopwith@redhat.com> 2.12pre-1
- 2.12pre-1
- Merge mount/losetup packages into the main package (#112324)
-- Lose separate
+- Lose separate
* Mon Nov 3 2003 Dan Walsh <dwalsh@redhat.com> 2.11y-35.sel
- remove selinux code from login and use pam_selinux
@@ -2610,7 +2594,7 @@ ipcs fixes
- Include isosize util
* Wed Aug 7 2002 Elliot Lee <sopwith@redhat.com> 2.11r-9
-- Patch120 (skipraid2) to fix #70353, because the original patch was
+- Patch120 (skipraid2) to fix #70353, because the original patch was
totally useless.
* Fri Aug 2 2002 Elliot Lee <sopwith@redhat.com> 2.11r-8
@@ -2630,7 +2614,7 @@ totally useless.
- only require usermode if we're shipping kbdrate here
* Fri Jun 28 2002 Trond Eivind Glomsrod <teg@redhat.com> 2.11r-3
-- Port the large swap patch to new util-linux... the off_t changes
+- Port the large swap patch to new util-linux... the off_t changes
now in main aren't sufficient
* Thu Jun 27 2002 Elliot Lee <sopwith@redhat.com> 2.11r-2
@@ -2641,17 +2625,17 @@ totally useless.
- Remove unused patches
* Thu Jun 27 2002 Elliot Lee <sopwith@redhat.com> 2.11n-19
-- Make a note here that this package was the source of the single change
-contained in util-linux-2.11f-18 (in 7.2/Alpha), and also contains the
+- Make a note here that this package was the source of the single change
+contained in util-linux-2.11f-18 (in 7.2/Alpha), and also contains the
rawman patch from util-linux-2.11f-17.1 (in 2.1AS).
-- Package has no runtime deps on slang, so remove the BuildRequires:
+- Package has no runtime deps on slang, so remove the BuildRequires:
slang-devel.
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Thu Jun 20 2002 Elliot Lee <sopwith@redhat.com> 2.11n-17
-- Fix teg's swapondetect patch to not print out the usage message when
+- Fix teg's swapondetect patch to not print out the usage message when
'swapon -a -e' is run. (#66690) (edit existing patch)
- Apply hjl's utmp handling patch (#66950) (patch116)
- Fix fdisk man page notes on IDE disk partition limit (#64013) (patch117)
@@ -2734,7 +2718,7 @@ slang-devel.
- Don't make the pivot_root.8 man page executable(!)
* Tue Oct 23 2001 Elliot Lee <sopwith@redhat.com> 2.11f-13
-- Patch/idea #76 from HJL, fixes bug #54741 (race condition in login
+- Patch/idea #76 from HJL, fixes bug #54741 (race condition in login
acquisition of controlling terminal).
* Thu Oct 11 2001 Bill Nottingham <notting@redhat.com>
@@ -3107,7 +3091,7 @@ acquisition of controlling terminal).
* Mon Mar 22 1999 Erik Troan <ewt@redhat.com>
- added vigr to file list
-* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
- auto rebuild in the new build environment (release 12)
* Thu Mar 18 1999 Cristian Gafton <gafton@redhat.com>
@@ -3190,7 +3174,7 @@ acquisition of controlling terminal).
- use proper tc*() calls rather then ioctl's
* Sun Dec 21 1997 Cristian Gafton <gafton@redhat.com>
-- fixed a security problem in chfn and chsh accepting too
+- fixed a security problem in chfn and chsh accepting too
long gecos fields
* Fri Dec 19 1997 Mike Wangsmo <wanger@redhat.com>
@@ -3206,7 +3190,7 @@ acquisition of controlling terminal).
- added vfat32 filesystem type to list recognized by fdisk
* Fri Oct 10 1997 Erik Troan <ewt@redhat.com>
-- don't build clock on the alpha
+- don't build clock on the alpha
- don't install chkdupexe
* Thu Oct 02 1997 Michael K. Johnson <johnsonm@redhat.com>