rpms/util-linux-ng/devel util-linux-ng-2.16-blkid-cachefile.patch, NONE, 1.1 uuidd.init, NONE, 1.1 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 util-linux-ng.spec, 1.49, 1.50 util-linux-ng-2.15-blkid-cachefile.patch, 1.1, NONE
kzak
kzak at fedoraproject.org
Sat Jul 25 20:18:48 UTC 2009
Author: kzak
Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19878
Modified Files:
.cvsignore sources util-linux-ng.spec
Added Files:
util-linux-ng-2.16-blkid-cachefile.patch uuidd.init
Removed Files:
util-linux-ng-2.15-blkid-cachefile.patch
Log Message:
* Sat Jul 25 2009 Karel Zak <kzak at redhat.com> 2.16-1
- upgrade to 2.16
ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-ReleaseNotes
- enable built-in libuuid (replacement for the old uuid stuff from e2fsprogs)
- new commands switch_root, uuidgen and uuidd (subpackage)
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(-)
--- NEW FILE util-linux-ng-2.16-blkid-cachefile.patch ---
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.
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 .
@@ -179,7 +179,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 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)
" [-t <token>] [-w <file>] [dev ...]\n\n"
" %1$s -p [-O <offset>] [-S <size>] [-o format] <dev> [dev ...]\n\n"
"Options:\n"
- " -c <file> cache file (default: /etc/blkid.tab, /dev/null = none)\n"
+ " -c <file> cache file (default: /etc/blkid/blkid.tab, /dev/null = none)\n"
" -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
@@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
specific block device names into configuration files.
.P
Block device information is normally kept 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
@@ -59,7 +59,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
@@ -77,7 +77,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-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);
-#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
--- NEW FILE uuidd.init ---
#!/bin/bash
#
# uuidd uuidd daemon for unique time-based UUID generation
#
# Author: Eric Sandeen <sandeen at redhat.com>
#
# chkconfig: - 60 99
#
# description: uuidd is a helper daemon to guarantee uniqueness of \
# time-based UUIDs when using libuuid.
# processname: uuidd
# pidfile: /var/lib/libuuid/uuidd.pid
#
### BEGIN INIT INFO
# Provides: uuidd
# Required-Start: $time $local_fs
# Required-Stop: $time $local_fs
# Default-Stop: 0 1 6
# Short-Description: UUID daemon
# Description: Daemon which guarantees uniqueness of time-based UUIDS
# when using libuuid.
### END INIT INFO
# source function library
. /etc/rc.d/init.d/functions
RETVAL=0
DAEMON=uuidd
start() {
echo -n $"Starting uuidd: "
daemon --user uuidd --pidfile /var/run/uuidd/uuidd.pid /usr/sbin/uuidd
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/uuidd
}
stop() {
echo -n $"Stopping uuidd: "
killproc uuidd
echo
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/uuidd
}
restart() {
stop
start
}
case "$1" in
start)
start
;;
stop)
stop
;;
restart|force-reload|reload)
restart
;;
condrestart)
[ -f /var/lock/subsys/uuidd ] && restart
;;
status)
status -p /var/run/uuidid/uuidd.pid uuidd uuidd
RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
exit 1
esac
exit $RETVAL
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore 10 Jun 2009 13:10:27 -0000 1.18
+++ .cvsignore 25 Jul 2009 20:18:47 -0000 1.19
@@ -1,2 +1,2 @@
-util-linux-ng-2.15.1.tar.bz2
+util-linux-ng-2.16.tar.bz2
floppy-0.16.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources 10 Jun 2009 13:10:27 -0000 1.18
+++ sources 25 Jul 2009 20:18:47 -0000 1.19
@@ -1,2 +1,2 @@
-a06d94c4dc94c56a636c6e456698e40d util-linux-ng-2.15.1.tar.bz2
+9623380641b0c2e0449f5b1ecc567663 util-linux-ng-2.16.tar.bz2
7eeb9a6f7a258174bf0fa80f1370788d floppy-0.16.tar.bz2
Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- util-linux-ng.spec 10 Jun 2009 13:10:27 -0000 1.49
+++ util-linux-ng.spec 25 Jul 2009 20:18:47 -0000 1.50
@@ -1,7 +1,7 @@
### Header
Summary: A collection of basic system utilities
Name: util-linux-ng
-Version: 2.15.1
+Version: 2.16
Release: 1%{?dist}
License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base
@@ -43,6 +43,7 @@ Source4: util-linux-ng-60-raw.rules
Source5: mount.tmpfs
Source8: nologin.c
Source9: nologin.8
+Source10: uuidd.init
Source11: http://download.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.bz2
### Obsoletes & Conflicts & Provides
@@ -95,7 +96,7 @@ Patch3: util-linux-ng-2.14-blockdev-rmpa
# 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.15-blkid-cachefile.patch
+Patch5: util-linux-ng-2.16-blkid-cachefile.patch
### Ready for upstream?
###
@@ -124,16 +125,67 @@ This is block device identification libr
Summary: Block device ID library
Group: Development/Libraries
License: LGPLv2+
+Provides: libblkid-static = %{version}-%{release}
Requires: libblkid = %{version}-%{release}
Requires: pkgconfig
-# for libuuid and uuid.pc
-Requires: e2fsprogs-devel
%description -n libblkid-devel
This is the block device identification development library and headers,
part of util-linux-ng.
+%package -n libuuid
+Summary: Universally unique ID library
+Group: Development/Libraries
+License: BSD
+
+%description -n libuuid
+This is the universally unique ID library, part of e2fsprogs.
+
+The libuuid library generates and parses 128-bit universally unique
+id's (UUID's). A UUID is an identifier that is unique across both
+space and time, with respect to the space of all UUIDs. A UUID can
+be used for multiple purposes, from tagging objects with an extremely
+short lifetime, to reliably identifying very persistent objects
+across a network.
+
+See also the "uuid" package, which is a separate implementation.
+
+%package -n libuuid-devel
+Summary: Universally unique ID library
+Group: Development/Libraries
+License: BSD
+Provides: libuuid-static = %{version}-%{release}
+Requires: libuuid = %{version}-%{release}
+Requires: pkgconfig
+
+%description -n libuuid-devel
+This is the universally unique ID development library and headers,
+part of e2fsprogs.
+
+The libuuid library generates and parses 128-bit universally unique
+id's (UUID's). A UUID is an identifier that is unique across both
+space and time, with respect to the space of all UUIDs. A UUID can
+be used for multiple purposes, from tagging objects with an extremely
+short lifetime, to reliably identifying very persistent objects
+across a network.
+
+See also the "uuid-devel" package, which is a separate implementation.
+
+
+%package -n uuidd
+Summary: Helper daemon to guarantee uniqueness of time-based UUIDs
+Group: System Environment/Daemons
+Requires: libuuid = %{version}-%{release}
+License: GPLv2
+Requires(pre): shadow-utils
+
+%description -n uuidd
+The uuidd package contains a userspace daemon (uuidd) which guarantees
+uniqueness of time-based UUID generation even at very high rates on
+SMP systems.
+
+
%prep
%setup -q -a 11 -n %{name}-%{upstream_version}
cp %{SOURCE8} %{SOURCE9} .
@@ -217,6 +269,15 @@ echo '.so man8/raw.8' > $RPM_BUILD_ROOT%
}
%endif
+# Our own initscript for uuidd
+install -D -m 755 %{SOURCE10} ${RPM_BUILD_ROOT}/etc/rc.d/init.d/uuidd
+# And a dirs uuidd needs that the makefiles don't create
+install -d ${RPM_BUILD_ROOT}/var/run/uuidd
+install -d ${RPM_BUILD_ROOT}/var/lib/libuuid
+
+# libtool junk
+rm -rf ${RPM_BUILD_ROOT}%{_libdir}/*.la
+
%ifarch sparc sparc64 sparcv9
rm -rf ${RPM_BUILD_ROOT}%{_bindir}/sunhostid
cat << E-O-F > ${RPM_BUILD_ROOT}%{_bindir}/sunhostid
@@ -249,13 +310,7 @@ ln -sf hwclock ${RPM_BUILD_ROOT}/sbin/cl
# remove libtool junk (TODO)
-rm -f ${RPM_BUILD_ROOT}/%{_lib}/libblkid.la
-
-# libtool installs all libraries to --libdir=/lib, but we need
-# devel stuff in /usr/lib (TODO)
-rm -f ${RPM_BUILD_ROOT}/%{_lib}/libblkid.so
-mv ${RPM_BUILD_ROOT}/%{_lib}/libblkid.a ${RPM_BUILD_ROOT}%{_libdir}/
-ln -sf ../../%{_lib}/libblkid.so.1 ${RPM_BUILD_ROOT}%{_libdir}/libblkid.so
+#rm -f ${RPM_BUILD_ROOT}/%{_lib}/libblkid.la
# install tmpfs mount helper
pushd ${RPM_BUILD_ROOT}/sbin
@@ -396,6 +451,24 @@ exit 0
%postun -n libblkid -p /sbin/ldconfig
+%post -n libuuid -p /sbin/ldconfig
+%postun -n libuuid -p /sbin/ldconfig
+
+%pre -n uuidd
+getent group uuidd >/dev/null || groupadd -r uuidd
+getent passwd uuidd >/dev/null || \
+useradd -r -g uuidd -d /var/lib/libuuid -s /sbin/nologin \
+ -c "UUID generator helper daemon" uuidd
+exit 0
+
+%post -n uuidd
+/sbin/chkconfig --add uuidd
+
+%preun -n uuidd
+if [ "$1" = 0 ]; then
+ /sbin/service uuidd stop > /dev/null 2>&1 || :
+ /sbin/chkconfig --del uuidd
+fi
%files -f %{name}.files
%defattr(-,root,root)
@@ -429,6 +502,7 @@ exit 0
/sbin/delpart
/sbin/fdisk
/sbin/findfs
+/sbin/fsck
/sbin/fsck.cramfs
/sbin/losetup
/sbin/mkfs
@@ -439,6 +513,7 @@ exit 0
/sbin/pivot_root
/sbin/swapoff
/sbin/swapon
+/sbin/switch_root
%{_bindir}/cal
%{_bindir}/chrt
@@ -471,6 +546,7 @@ exit 0
%{_bindir}/setterm
%{_bindir}/tailf
%{_bindir}/ul
+%{_bindir}/uuidgen
%{_bindir}/whereis
%{_sbindir}/ldattach
@@ -515,6 +591,7 @@ exit 0
%{_mandir}/man1/tailf.1*
%{_mandir}/man1/taskset.1*
%{_mandir}/man1/ul.1*
+%{_mandir}/man1/uuidgen.1*
%{_mandir}/man1/whereis.1*
%{_mandir}/man1/write.1*
@@ -528,6 +605,7 @@ exit 0
%{_mandir}/man8/delpart.8*
%{_mandir}/man8/fdisk.8*
%{_mandir}/man8/findfs.8*
+%{_mandir}/man8/fsck.8*
%{_mandir}/man8/isosize.8*
%{_mandir}/man8/ldattach.8*
%{_mandir}/man8/losetup.8*
@@ -541,6 +619,7 @@ exit 0
%{_mandir}/man8/setarch.8*
%{_mandir}/man8/swapoff.8*
%{_mandir}/man8/swapon.8*
+%{_mandir}/man8/switch_root.8*
%{_mandir}/man8/umount.8*
%if %{include_raw}
@@ -581,6 +660,15 @@ exit 0
%endif
+%files -n uuidd
+%defattr(-,root,root)
+/etc/rc.d/init.d/uuidd
+%{_mandir}/man8/uuidd.8*
+%attr(-, uuidd, uuidd) %{_sbindir}/uuidd
+%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
+%dir %attr(2775, uuidd, uuidd) /var/run/uuidd
+
+
%files -n libblkid
%defattr(-,root,root)
%dir /etc/blkid
@@ -594,9 +682,38 @@ exit 0
%{_includedir}/blkid
%{_mandir}/man3/libblkid.3*
%{_libdir}/pkgconfig/blkid.pc
-%{_includedir}/blkid
+
+
+%files -n libuuid
+%defattr(-,root,root)
+/%{_lib}/libuuid.so.*
+
+%files -n libuuid-devel
+%defattr(-,root,root)
+%{_libdir}/libuuid.a
+%{_libdir}/libuuid.so
+%{_includedir}/uuid
+%{_mandir}/man3/uuid.3*
+%{_mandir}/man3/uuid_clear.3*
+%{_mandir}/man3/uuid_compare.3*
+%{_mandir}/man3/uuid_copy.3*
+%{_mandir}/man3/uuid_generate.3*
+%{_mandir}/man3/uuid_generate_random.3*
+%{_mandir}/man3/uuid_generate_time.3*
+%{_mandir}/man3/uuid_is_null.3*
+%{_mandir}/man3/uuid_parse.3*
+%{_mandir}/man3/uuid_time.3*
+%{_mandir}/man3/uuid_unparse.3*
+%{_libdir}/pkgconfig/uuid.pc
+
%changelog
+* Sat Jul 25 2009 Karel Zak <kzak at redhat.com> 2.16-1
+- upgrade to 2.16
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-ReleaseNotes
+- enable built-in libuuid (replacement for the old uuid stuff from e2fsprogs)
+- new commands switch_root, uuidgen and uuidd (subpackage)
+
* Wed Jun 10 2009 Karel Zak <kzak at redhat.com> 2.15.1-1
- upgrade to 2.15.1
--- util-linux-ng-2.15-blkid-cachefile.patch DELETED ---
More information about the fedora-extras-commits
mailing list