[util-linux/f16] 2.20-0.1: upgrade to 2.20-rc1
kzak
kzak at fedoraproject.org
Tue Aug 2 15:16:40 UTC 2011
commit de1910078fbd60cd20ba3494c2800d121620bfda
Author: Karel Zak <kzak at redhat.com>
Date: Tue Aug 2 16:56:01 2011 +0200
2.20-0.1: upgrade to 2.20-rc1
Signed-off-by: Karel Zak <kzak at redhat.com>
.gitignore | 1 +
sources | 2 +-
util-linux-2.20-blkid-cachefile.patch | 64 +++++++++++++++++++++++
util-linux-2.20-fdformat-man-ide.patch | 25 +++++++++
util-linux-ng-2.13-fdformat-man-ide.patch | 23 ---------
util-linux-ng-2.16-blkid-cachefile.patch | 78 -----------------------------
util-linux.spec | 48 +++++++-----------
7 files changed, 109 insertions(+), 132 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c60fbf5..13488f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/floppy-0.18.tar.bz2
/util-linux-2.19.1-rc1.tar.bz2
/util-linux-2.19.1.tar.bz2
+/util-linux-2.20-rc1.tar.bz2
diff --git a/sources b/sources
index f3dea83..11c77ff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3eab06f05163dfa65479c44e5231932c util-linux-2.19.1.tar.bz2
+a8ae69612162422b2d4d331ba90ef86d util-linux-2.20-rc1.tar.bz2
a02aac97c74259ca1b24972c89147ca4 floppy-0.18.tar.bz2
diff --git a/util-linux-2.20-blkid-cachefile.patch b/util-linux-2.20-blkid-cachefile.patch
new file mode 100644
index 0000000..12b75d5
--- /dev/null
+++ b/util-linux-2.20-blkid-cachefile.patch
@@ -0,0 +1,64 @@
+diff -up util-linux-2.20-rc1/libblkid/libblkid.3.kzak util-linux-2.20-rc1/libblkid/libblkid.3
+--- util-linux-2.20-rc1/libblkid/libblkid.3.kzak 2011-07-26 16:43:07.000000000 +0200
++++ util-linux-2.20-rc1/libblkid/libblkid.3 2011-07-29 21:17:20.883777687 +0200
+@@ -28,7 +28,7 @@ partitions and block device topology.
+ .P
+ The high-level part of the library keeps information about block devices
+ in a cache file
+-.I /etc/blkid.tab
++.I /etc/blkid/blkid.tab
+ and is verified to still be valid before being returned to the user
+ (if the user has read permission on the raw block device, otherwise not).
+ The cache file also allows unprivileged users (normally anyone other
+@@ -69,7 +69,7 @@ symlink does not match with LABEL or UUI
+ .I CACHE_FILE=<path>
+ Overrides the standard location of the cache file. This setting can be
+ overridden by the environment variable BLKID_FILE. Default is
+-.I /etc/blkid.tab.
++.I /etc/blkid/blkid.tab.
+ .TP
+ .I EVALUATE=<methods>
+ Defines LABEL and UUID evaluation method(s). Currently, the libblkid library
+@@ -87,7 +87,7 @@ from Ted Ts'o. The library was subseque
+ The low-level probing code was rewritten by Karel Zak.
+ .SH FILES
+ .TP 18
+-.I /etc/blkid.tab
++.I /etc/blkid/blkid.tab
+ caches data extracted from each recognized block device
+ .TP
+ .I /etc/blkid.conf
+diff -up util-linux-2.20-rc1/libblkid/src/blkidP.h.kzak util-linux-2.20-rc1/libblkid/src/blkidP.h
+--- util-linux-2.20-rc1/libblkid/src/blkidP.h.kzak 2011-07-20 21:55:23.000000000 +0200
++++ util-linux-2.20-rc1/libblkid/src/blkidP.h 2011-07-29 21:17:52.852169993 +0200
+@@ -286,7 +286,7 @@ extern char *blkid_strdup(const char *s)
+ extern char *blkid_strndup(const char *s, const int length);
+ extern char *blkid_strconcat(const char *a, const char *b, const char *c);
+
+-#define BLKID_CACHE_FILE "/etc/blkid.tab"
++#define BLKID_CACHE_FILE "/etc/blkid/blkid.tab"
+ #define BLKID_CONFIG_FILE "/etc/blkid.conf"
+
+ #define BLKID_ERR_IO 5
+diff -up util-linux-2.20-rc1/misc-utils/blkid.8.kzak util-linux-2.20-rc1/misc-utils/blkid.8
+--- util-linux-2.20-rc1/misc-utils/blkid.8.kzak 2011-07-20 21:55:23.000000000 +0200
++++ util-linux-2.20-rc1/misc-utils/blkid.8 2011-07-29 21:15:37.312506693 +0200
+@@ -79,7 +79,7 @@ same meaning as "KiB") or decimal (10^N)
+ Read from
+ .I cachefile
+ instead of reading from the default cache file
+-.IR /etc/blkid.tab .
++.IR /etc/blkid/blkid.tab .
+ If you want to start with a clean cache (i.e. don't report devices previously
+ scanned but not necessarily available at this time), specify
+ .IR /dev/null .
+@@ -242,7 +242,7 @@ Display version number and exit.
+ Write the device cache to
+ .I writecachefile
+ instead of writing it to the default cache file
+-.IR /etc/blkid.tab .
++.IR /etc/blkid/blkid.tab .
+ If you don't want to save the cache at all, specify
+ .IR /dev/null.
+ If not specified, it will be the same file as that given with the
+diff -up util-linux-2.20-rc1/misc-utils/blkid.c.kzak util-linux-2.20-rc1/misc-utils/blkid.c
diff --git a/util-linux-2.20-fdformat-man-ide.patch b/util-linux-2.20-fdformat-man-ide.patch
new file mode 100644
index 0000000..de3618b
--- /dev/null
+++ b/util-linux-2.20-fdformat-man-ide.patch
@@ -0,0 +1,25 @@
+diff -up util-linux-2.20-rc1/disk-utils/fdformat.8.orig util-linux-2.20-rc1/disk-utils/fdformat.8
+--- util-linux-2.20-rc1/disk-utils/fdformat.8.orig 2011-07-20 21:55:23.000000000 +0200
++++ util-linux-2.20-rc1/disk-utils/fdformat.8 2011-07-29 21:08:57.558601033 +0200
+@@ -43,6 +43,11 @@ when a non-standard format is being used
+ autodetected earlier. In this case, use
+ .BR setfdprm (8)
+ to load the disk parameters.
++
++For ATAPI IDE floppy driver (also known as LS-120 drives or "Superdisk"
++drives) you have to use the
++.BR floppy (8).
++
+ .SH OPTIONS
+ .TP
+ \fB\-n\fR, \fB\-\-no\-verify\fR
+@@ -58,7 +63,8 @@ Display help and exit.
+ .BR fd (4),
+ .BR setfdprm (8),
+ .BR mkfs (8),
+-.BR emkfs (8)
++.BR emkfs (8),
++.BR floppy (8)
+ .SH AUTHOR
+ Werner Almesberger (almesber at nessie.cs.id.ethz.ch)
+ .SH AVAILABILITY
diff --git a/util-linux.spec b/util-linux.spec
index 8b59dad..dc77629 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,13 +1,13 @@
### Header
Summary: A collection of basic system utilities
Name: util-linux
-Version: 2.19.1
-Release: 2%{?dist}
+Version: 2.20
+Release: 0.1%{?dist}
License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base
URL: http://kernel.org/~kzak/util-linux/
-%define upstream_version %{version}
+%define upstream_version %{version}-rc1
### Features
%if 0%{?rhel}
@@ -66,7 +66,7 @@ Requires: udev
# add a missing header
Patch0: util-linux-2.19-floppy-locale.patch
# add note about ATAPI IDE floppy to fdformat.8
-Patch1: util-linux-ng-2.13-fdformat-man-ide.patch
+Patch1: util-linux-2.20-fdformat-man-ide.patch
# 169628 - /usr/bin/floppy doesn't work with /dev/fd0
Patch2: util-linux-2.19-floppy-generic.patch
@@ -75,7 +75,7 @@ Patch2: util-linux-2.19-floppy-generic.patch
# 199745 - Non-existant simpleinit(8) mentioned in ctrlaltdel(8)
Patch4: util-linux-ng-2.13-ctrlaltdel-man.patch
# /etc/blkid.tab --> /etc/blkid/blkid.tab
-Patch5: util-linux-ng-2.16-blkid-cachefile.patch
+Patch5: util-linux-2.20-blkid-cachefile.patch
### Ready for upstream?
###
@@ -84,18 +84,6 @@ Patch7: util-linux-ng-2.13-login-lastlog.patch
# 231192 - ipcs is not printing correct values on pLinux
Patch8: util-linux-ng-2.15-ipcs-32bit.patch
-### Upstream patches
-###
-# kernel "3.0"
-Patch9: util-linux-2.19-kernel-version.patch
-# 709319 - 'mount -a' mounts already mounted directories
-Patch10: util-linux-2.19-libmount-mounted.patch
-Patch11: util-linux-2.19-mount-a-bind.patch
-# 709681 - failure to mount if a mount point ends with a slash in /etc/fstab
-Patch12: util-linux-2.19-mount-fsname.patch
-# 716483 - /var/tmp --(BIND-mounted)--> /tmp disrupts/hangs bootup
-Patch13: util-linux-2.19-mount-mountpoint.patch
-
%description
The util-linux package contains a large variety of low-level system
utilities that are necessary for a Linux system to function. Among
@@ -209,12 +197,6 @@ cp %{SOURCE8} %{SOURCE9} .
%patch5 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-
%build
unset LINGUAS || :
@@ -514,6 +496,7 @@ fi
/bin/kill
/bin/lsblk
/bin/more
+/bin/mountpoint
/bin/taskset
/sbin/addpart
@@ -606,6 +589,7 @@ fi
%{_mandir}/man1/lscpu.1*
%{_mandir}/man1/mcookie.1*
%{_mandir}/man1/more.1*
+%{_mandir}/man1/mountpoint.1*
%{_mandir}/man1/namei.1*
%{_mandir}/man1/readprofile.1*
%{_mandir}/man1/rename.1*
@@ -622,7 +606,6 @@ fi
%{_mandir}/man1/uuidgen.1*
%{_mandir}/man1/whereis.1*
%{_mandir}/man1/write.1*
-
%{_mandir}/ru/man1/ddate.1.gz
%{_mandir}/man5/fstab.5*
@@ -709,12 +692,12 @@ fi
%files -n libmount
%defattr(-,root,root)
-%doc shlibs/mount/COPYING.libmount
+%doc libmount/COPYING.libmount
/%{_lib}/libmount.so.*
%files -n libmount-devel
%defattr(-,root,root)
-%doc shlibs/mount/COPYING.libmount
+%doc libmount/COPYING.libmount
%{_libdir}/libmount.so
%{_includedir}/libmount
%{_libdir}/pkgconfig/mount.pc
@@ -722,13 +705,13 @@ fi
%files -n libblkid
%defattr(-,root,root)
-%doc shlibs/blkid/COPYING.libblkid
+%doc libblkid/COPYING.libblkid
%dir /etc/blkid
/%{_lib}/libblkid.so.*
%files -n libblkid-devel
%defattr(-,root,root)
-%doc shlibs/blkid/COPYING.libblkid
+%doc libblkid/COPYING.libblkid
%{_libdir}/libblkid.so
%{_includedir}/blkid
%{_mandir}/man3/libblkid.3*
@@ -737,12 +720,12 @@ fi
%files -n libuuid
%defattr(-,root,root)
-%doc shlibs/uuid/COPYING.libuuid
+%doc libuuid/COPYING.libuuid
/%{_lib}/libuuid.so.*
%files -n libuuid-devel
%defattr(-,root,root)
-%doc shlibs/uuid/COPYING.libuuid
+%doc libuuid/COPYING.libuuid
%{_libdir}/libuuid.so
%{_includedir}/uuid
%{_mandir}/man3/uuid.3*
@@ -752,6 +735,7 @@ fi
%{_mandir}/man3/uuid_generate.3*
%{_mandir}/man3/uuid_generate_random.3*
%{_mandir}/man3/uuid_generate_time.3*
+%{_mandir}/man3/uuid_generate_time_safe.3*
%{_mandir}/man3/uuid_is_null.3*
%{_mandir}/man3/uuid_parse.3*
%{_mandir}/man3/uuid_time.3*
@@ -760,6 +744,10 @@ fi
%changelog
+* Fri Aug 2 2021 Karel Zak <kzak at redhat.com> 2.20.0.1
+- upgrade to the release 2.20-rc1
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/v2.20-ReleaseNotes
+
* Mon Jul 4 2011 Karel Zak <kzak at redhat.com> 2.19.1-2
- fix #716483 - /var/tmp --(BIND-mounted)--> /tmp disrupts/hangs bootup
- fix #709681 - failure to mount if a mount point ends with a slash in /etc/fstab
More information about the scm-commits
mailing list