rpms/util-linux-ng/devel .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 util-linux-ng-2.16-blkid-cachefile.patch, 1.1, 1.2 util-linux-ng.spec, 1.63, 1.64 util-linux-ng-2.14-blockdev-rmpart.patch, 1.1, NONE util-linux-ng-2.14-sfdisk-dump.patch, 1.1, NONE util-linux-ng-2.16-blkid-swsuspend.patch, 1.1, NONE util-linux-ng-2.16-libblkid-compression.patch, 1.1, NONE util-linux-ng-2.16-libblkid-ext2.patch, 1.1, NONE util-linux-ng-2.16-switchroot-tty.patch, 1.1, NONE
kzak
kzak at fedoraproject.org
Mon Oct 19 12:51:04 UTC 2009
Author: kzak
Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19626
Modified Files:
.cvsignore sources util-linux-ng-2.16-blkid-cachefile.patch
util-linux-ng.spec
Removed Files:
util-linux-ng-2.14-blockdev-rmpart.patch
util-linux-ng-2.14-sfdisk-dump.patch
util-linux-ng-2.16-blkid-swsuspend.patch
util-linux-ng-2.16-libblkid-compression.patch
util-linux-ng-2.16-libblkid-ext2.patch
util-linux-ng-2.16-switchroot-tty.patch
Log Message:
* Mon Oct 19 2009 Karel Zak <kzak at 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)
- 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)
- merged upstream:
util-linux-ng-2.14-sfdisk-dump.patch
util-linux-ng-2.16-blkid-swsuspend.patch
util-linux-ng-2.16-libblkid-compression.patch
util-linux-ng-2.16-libblkid-ext2.patch
util-linux-ng-2.16-switchroot-tty.patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore 25 Jul 2009 20:18:47 -0000 1.19
+++ .cvsignore 19 Oct 2009 12:51:04 -0000 1.20
@@ -1,2 +1,2 @@
-util-linux-ng-2.16.tar.bz2
+util-linux-ng-2.17-git5e51568.tar.bz2
floppy-0.16.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources 25 Jul 2009 20:18:47 -0000 1.19
+++ sources 19 Oct 2009 12:51:04 -0000 1.20
@@ -1,2 +1,2 @@
-9623380641b0c2e0449f5b1ecc567663 util-linux-ng-2.16.tar.bz2
+d17141b5dabf4605b1c1db4cf8cff38a util-linux-ng-2.17-git5e51568.tar.bz2
7eeb9a6f7a258174bf0fa80f1370788d floppy-0.16.tar.bz2
util-linux-ng-2.16-blkid-cachefile.patch:
misc-utils/blkid.8 | 4 ++--
misc-utils/blkid.c | 2 +-
shlibs/blkid/libblkid.3 | 6 +++---
shlibs/blkid/src/blkidP.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
Index: util-linux-ng-2.16-blkid-cachefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.16-blkid-cachefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- util-linux-ng-2.16-blkid-cachefile.patch 25 Jul 2009 20:18:47 -0000 1.1
+++ util-linux-ng-2.16-blkid-cachefile.patch 19 Oct 2009 12:51:04 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up util-linux-ng-2.16/misc-utils/blkid.8.kzak util-linux-ng-2.16/misc-utils/blkid.8
---- util-linux-ng-2.16/misc-utils/blkid.8.kzak 2009-07-04 01:20:01.000000000 +0200
-+++ util-linux-ng-2.16/misc-utils/blkid.8 2009-07-16 00:41:28.000000000 +0200
-@@ -64,7 +64,7 @@ more devices.
+diff -up util-linux-ng-2.17-git5e51568/misc-utils/blkid.8.kzak util-linux-ng-2.17-git5e51568/misc-utils/blkid.8
+--- util-linux-ng-2.17-git5e51568/misc-utils/blkid.8.kzak 2009-10-16 22:50:03.000000000 +0200
++++ util-linux-ng-2.17-git5e51568/misc-utils/blkid.8 2009-10-19 14:31:10.000000000 +0200
+@@ -67,7 +67,7 @@ more devices.
Read from
.I cachefile
instead of reading from the default cache file
@@ -10,7 +10,7 @@ diff -up util-linux-ng-2.16/misc-utils/b
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 .
-@@ -179,7 +179,7 @@ Display version number and exit.
+@@ -190,7 +190,7 @@ Display version number and exit.
Write the device cache to
.I writecachefile
instead of writing it to the default cache file
@@ -19,10 +19,10 @@ diff -up util-linux-ng-2.16/misc-utils/b
If you don't want to save the cache to the default file, specify
.IR /dev/null.
If not specified it will be the same file as that given by the
-diff -up util-linux-ng-2.16/misc-utils/blkid.c.kzak util-linux-ng-2.16/misc-utils/blkid.c
---- util-linux-ng-2.16/misc-utils/blkid.c.kzak 2009-07-04 01:20:01.000000000 +0200
-+++ util-linux-ng-2.16/misc-utils/blkid.c 2009-07-16 00:41:28.000000000 +0200
-@@ -60,7 +60,7 @@ static void usage(int error)
+diff -up util-linux-ng-2.17-git5e51568/misc-utils/blkid.c.kzak util-linux-ng-2.17-git5e51568/misc-utils/blkid.c
+--- util-linux-ng-2.17-git5e51568/misc-utils/blkid.c.kzak 2009-10-16 22:50:03.000000000 +0200
++++ util-linux-ng-2.17-git5e51568/misc-utils/blkid.c 2009-10-19 14:31:10.000000000 +0200
+@@ -62,7 +62,7 @@ static void usage(int error)
" [-t <token>] [-w <file>] [dev ...]\n\n"
" %1$s -p [-O <offset>] [-S <size>] [-o format] <dev> [dev ...]\n\n"
"Options:\n"
@@ -31,9 +31,9 @@ diff -up util-linux-ng-2.16/misc-utils/b
" -h print this usage message and exit\n"
" -g garbage collect the blkid cache\n"
" -o <format> output format; can be one of:\n"
-diff -up util-linux-ng-2.16/shlibs/blkid/libblkid.3.kzak util-linux-ng-2.16/shlibs/blkid/libblkid.3
---- util-linux-ng-2.16/shlibs/blkid/libblkid.3.kzak 2009-07-04 01:20:03.000000000 +0200
-+++ util-linux-ng-2.16/shlibs/blkid/libblkid.3 2009-07-16 00:40:13.000000000 +0200
+diff -up util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3.kzak util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3
+--- util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3.kzak 2009-10-16 22:50:03.000000000 +0200
++++ util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3 2009-10-19 14:31:10.000000000 +0200
@@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
specific block device names into configuration files.
.P
@@ -61,12 +61,12 @@ diff -up util-linux-ng-2.16/shlibs/blkid
caches data extracted from each recognized block device
.TP
.I /etc/blkid.conf
-diff -up util-linux-ng-2.16/shlibs/blkid/src/blkidP.h.kzak util-linux-ng-2.16/shlibs/blkid/src/blkidP.h
---- util-linux-ng-2.16/shlibs/blkid/src/blkidP.h.kzak 2009-07-13 20:30:36.000000000 +0200
-+++ util-linux-ng-2.16/shlibs/blkid/src/blkidP.h 2009-07-16 00:40:13.000000000 +0200
-@@ -223,7 +223,7 @@ struct blkid_struct_cache
- extern char *blkid_strdup(const char *s);
- extern char *blkid_strndup(const char *s, const int length);
+diff -up util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h.kzak util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h
+--- util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h.kzak 2009-10-16 22:50:03.000000000 +0200
++++ util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h 2009-10-19 14:32:03.000000000 +0200
+@@ -267,7 +267,7 @@ extern char *blkid_strconcat(const char
+ extern int blkid_fstatat(DIR *dir, const char *dirname, const char *filename,
+ struct stat *st, int nofollow);
-#define BLKID_CACHE_FILE "/etc/blkid.tab"
+#define BLKID_CACHE_FILE "/etc/blkid/blkid.tab"
Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- util-linux-ng.spec 5 Oct 2009 07:25:54 -0000 1.63
+++ util-linux-ng.spec 19 Oct 2009 12:51:04 -0000 1.64
@@ -1,14 +1,15 @@
+%define snapshot_hash git5e51568
+%define upstream_version %{version}-%{snapshot_hash}
+
### Header
Summary: A collection of basic system utilities
Name: util-linux-ng
-Version: 2.16
-Release: 13%{?dist}
+Version: 2.17
+Release: 0.1.%{snapshot_hash}%{?dist}
License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base
URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
-%define upstream_version %{version}
-
### Features
%if 0%{?rhel}
%define include_raw 1
@@ -90,8 +91,6 @@ Patch2: util-linux-ng-2.13-floppy-generi
### Fedora/RHEL specific patches -- need to die!
###
-# remove partitions
-Patch3: util-linux-ng-2.14-blockdev-rmpart.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
@@ -104,19 +103,6 @@ Patch7: util-linux-ng-2.13-login-lastlog
# 231192 - ipcs is not printing correct values on pLinux
Patch8: util-linux-ng-2.15-ipcs-32bit.patch
-### Upstream patches
-###
-# 513104 - blkid returns no fstype for ext2 device when ext2 module not loaded
-Patch9: util-linux-ng-2.16-libblkid-ext2.patch
-# 518572 - blkid requires ext2.ko to be decompressed on installation media
-Patch10: util-linux-ng-2.16-libblkid-compression.patch
-# 522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
-Patch11: util-linux-ng-2.14-sfdisk-dump.patch
-# Swsuspend does not work
-Patch12: util-linux-ng-2.16-blkid-swsuspend.patch
-# 519237 - bash: cannot set terminal process group (-1): Inappropriate ioctl for device
-Patch13: util-linux-ng-2.16-switchroot-tty.patch
-
%description
The util-linux-ng package contains a large variety of low-level system
utilities that are necessary for a Linux system to function. Among
@@ -205,16 +191,10 @@ cp %{SOURCE8} %{SOURCE9} .
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
%build
unset LINGUAS || :
@@ -236,7 +216,6 @@ export SUID_LDFLAGS="-pie"
%endif
--with-selinux \
--with-audit \
- --with-fsprobe=builtin \
--disable-makeinstall-chown
# build util-linux-ng
@@ -531,6 +510,7 @@ fi
/sbin/swapoff
/sbin/swapon
/sbin/switch_root
+/sbin/wipefs
%{_bindir}/cal
%{_bindir}/chrt
@@ -539,6 +519,7 @@ fi
%{_bindir}/colrm
%{_bindir}/column
%{_bindir}/ddate
+%{_bindir}/fallocate
%{_bindir}/flock
%{_bindir}/getopt
%{_bindir}/hexdump
@@ -563,6 +544,7 @@ fi
%{_bindir}/setterm
%{_bindir}/tailf
%{_bindir}/ul
+%{_bindir}/unshare
%{_bindir}/uuidgen
%{_bindir}/whereis
@@ -582,6 +564,7 @@ fi
%{_mandir}/man1/column.1*
%{_mandir}/man1/ddate.1*
%{_mandir}/man1/dmesg.1*
+%{_mandir}/man1/fallocate.1*
%{_mandir}/man1/flock.1*
%{_mandir}/man1/getopt.1*
%{_mandir}/man1/hexdump.1*
@@ -608,6 +591,7 @@ fi
%{_mandir}/man1/tailf.1*
%{_mandir}/man1/taskset.1*
%{_mandir}/man1/ul.1*
+%{_mandir}/man1/unshare.1*
%{_mandir}/man1/uuidgen.1*
%{_mandir}/man1/whereis.1*
%{_mandir}/man1/write.1*
@@ -638,6 +622,7 @@ fi
%{_mandir}/man8/swapon.8*
%{_mandir}/man8/switch_root.8*
%{_mandir}/man8/umount.8*
+%{_mandir}/man8/wipefs.8*
%if %{include_raw}
/bin/raw
@@ -725,6 +710,19 @@ fi
%changelog
+* Mon Oct 19 2009 Karel Zak <kzak at 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)
+- 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)
+- merged upstream:
+ util-linux-ng-2.14-sfdisk-dump.patch
+ util-linux-ng-2.16-blkid-swsuspend.patch
+ util-linux-ng-2.16-libblkid-compression.patch
+ util-linux-ng-2.16-libblkid-ext2.patch
+ util-linux-ng-2.16-switchroot-tty.patch
+
* Mon Oct 5 2009 Karel Zak <kzak at redhat.com> 2.16-13
- fix spec file
--- util-linux-ng-2.14-blockdev-rmpart.patch DELETED ---
--- util-linux-ng-2.14-sfdisk-dump.patch DELETED ---
--- util-linux-ng-2.16-blkid-swsuspend.patch DELETED ---
--- util-linux-ng-2.16-libblkid-compression.patch DELETED ---
--- util-linux-ng-2.16-libblkid-ext2.patch DELETED ---
--- util-linux-ng-2.16-switchroot-tty.patch DELETED ---
More information about the fedora-extras-commits
mailing list