Hello community,
here is the log from the commit of package util-linux for openSUSE:Factory
checked in at Fri Jan 14 01:23:23 CET 2011.
--------
--- util-linux/util-linux.changes 2010-12-14 17:25:55.000000000 +0100
+++ util-linux/util-linux.changes 2011-01-10 14:21:44.000000000 +0100
@@ -1,0 +2,53 @@
+Thu Jan 6 16:43:46 UTC 2011 - puzel@novell.com
+
+- update to util-linux-2.19-rc1
+- important changes:
+ * lsblk(8):
+ - this NEW COMMAND lists information about all or selected block
+ devices in tree-like format.
+ * partx(8):
+ - this command has been rewritten to use libblkid for partition
+ tables parsing. It supports aix, bsd, dos, gpt, mac, minix,
+ sgi, solaris_x86, sun, ultrix and unixware now.
+ - supports new command line option "--show" to list partitions in
+ new format
+ - prints UUID and name for GPT and mac partitions
+ * findmnt(8):
+ - supports new command line option "--submounts" to list all
+ submounts for selected mountpoint(s)
+ * agetty(8):
+ - supports new command line options "-c" and "-s" to reuse
+ already initialized tty cflags and existing baud rate
+ * mount(8), umount(8):
+ - could be linked with libmount (--enable-libmount-mount) to
+ manage userspace mount options outside /etc/mtab on systems
+ where the file is a symlink to /proc/mounts. (EXPERIMENTAL,
+ enabled in openSUSE package)
+ * losetup(8), mount(8):
+ - uses /sys/dev/block/<device>/loop/backing_file rather than
+ loopdev ioctls (requires kernel >= 2.6.37)
+ * fsck(8):
+ - supports new command line option "-l" to lock whole-disk device
+ by exclusive flock(2). This option is recommended when more
+ fsck(8) instances are executed in the same time.
+ * rtcwake(8):
+ - supports new mode "show" to print the current RTC alarm time
+ * fstrim(8):
+ - this NEW COMMAND allows to discard unused blocks on a mounted
+ filesystem (wrapper for FITRIM ioctl)
+ * swapon(8):
+ - supports new options "discard" and "nofail"
+
+- in post, replace /etc/mtab with a symlink to /proc/mounts/self
+- drop following patches (in upstream)
+ - util-linux-swapon-btrfs-limitations
+ - util-linux-agetty-s-option.patch
+ - util-linux-fsck-l-option.patch
+ - util-linux-2.18-no-canonicalize-fix.patch
+ - util-linux-swapon-canonicalize-swap-device.patch
+- fix uuidd Summary and Description
+- build with --enable-libmount-mount (new option)
+- use set_permissions macros
+- run spec-cleaner
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
util-linux-2.18-no-canonicalize-fix.patch
util-linux-agetty-s-option.patch
util-linux-fsck-l-option.patch
util-linux-ng-2.18.tar.bz2
util-linux-swapon-btrfs-limitations
util-linux-swapon-canonicalize-swap-device.patch
New:
----
util-linux-2.19-rc1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ util-linux.spec ++++++
++++ 679 lines (skipped)
++++ between util-linux/util-linux.spec
++++ and util-linux/util-linux.spec
++++++ util-linux-2.17.1-mount_losetup_crypto.patch ++++++
--- /var/tmp/diff_new_pack.EANKll/_old 2011-01-14 01:13:34.000000000 +0100
+++ /var/tmp/diff_new_pack.EANKll/_new 2011-01-14 01:13:34.000000000 +0100
@@ -38,10 +38,10 @@
create mode 100644 mount/sha512.c
create mode 100644 mount/sha512.h
-Index: util-linux-ng-2.18/mount/Makefile.am
+Index: util-linux-2.19-rc1/mount/Makefile.am
===================================================================
---- util-linux-ng-2.18.orig/mount/Makefile.am
-+++ util-linux-ng-2.18/mount/Makefile.am
+--- util-linux-2.19-rc1.orig/mount/Makefile.am
++++ util-linux-2.19-rc1/mount/Makefile.am
@@ -7,7 +7,7 @@ sbin_PROGRAMS = losetup swapon
dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
@@ -51,10 +51,10 @@
# generic header for mount and umount
hdrs_mount = fstab.h mount_mntent.h mount_constants.h \
-Index: util-linux-ng-2.18/mount/lomount.c
+Index: util-linux-2.19-rc1/mount/lomount.c
===================================================================
---- util-linux-ng-2.18.orig/mount/lomount.c
-+++ util-linux-ng-2.18/mount/lomount.c
+--- util-linux-2.19-rc1.orig/mount/lomount.c
++++ util-linux-2.19-rc1/mount/lomount.c
@@ -23,6 +23,12 @@
#include "sundries.h"
#include "xmalloc.h"
@@ -68,7 +68,7 @@
#ifdef LOOP_SET_FD
-@@ -390,12 +396,22 @@ show_loop_fd(int fd, char *device) {
+@@ -464,12 +470,22 @@ show_loop_fd(int fd, char *device) {
if (loopinfo64.lo_encrypt_type ||
loopinfo64.lo_crypt_name[0]) {
@@ -94,7 +94,7 @@
}
printf("\n");
return 0;
-@@ -644,7 +660,7 @@ xgetpass(int pfd, const char *prompt) {
+@@ -718,7 +734,7 @@ xgetpass(int pfd, const char *prompt) {
}
if (pass == NULL)
@@ -103,7 +103,7 @@
pass[i] = 0;
return pass;
-@@ -658,6 +674,24 @@ digits_only(const char *s) {
+@@ -732,6 +748,24 @@ digits_only(const char *s) {
return 1;
}
@@ -128,7 +128,7 @@
/*
* return codes:
* 0 - success
-@@ -666,10 +700,11 @@ digits_only(const char *s) {
+@@ -740,10 +774,11 @@ digits_only(const char *s) {
*/
int
set_loop(const char *device, const char *file, unsigned long long offset,
@@ -142,7 +142,7 @@
char *filename;
if (verbose) {
-@@ -707,13 +742,37 @@ set_loop(const char *device, const char
+@@ -781,13 +816,37 @@ set_loop(const char *device, const char
filename = (char *) file;
xstrncpy((char *)loopinfo64.lo_file_name, filename, LO_NAME_SIZE);
@@ -182,7 +182,7 @@
}
}
-@@ -734,20 +793,69 @@ set_loop(const char *device, const char
+@@ -808,20 +867,69 @@ set_loop(const char *device, const char
}
#endif
@@ -264,9 +264,9 @@
}
if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
-@@ -897,7 +1005,13 @@ usage(void) {
+@@ -969,7 +1077,13 @@ usage(FILE *f) {
- fprintf(stderr, _("\nOptions:\n"
+ fprintf(f, _("\nOptions:\n"
" -e | --encryption <type> enable data encryption with specified \n"
+ " -H | --phash <type> hash password using specified algorithm (sha512/sha256/sha384/rmd160/none)\n"
" -h | --help this help\n"
@@ -278,7 +278,7 @@
" -o | --offset <num> start at offset <num> into file\n"
" --sizelimit <num> loop limited to only <num> bytes of the file\n"
" -p | --pass-fd <num> read passphrase from file descriptor <num>\n"
-@@ -910,11 +1024,14 @@ usage(void) {
+@@ -983,11 +1097,14 @@ usage(FILE *f) {
int
main(int argc, char **argv) {
char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc;
@@ -293,7 +293,7 @@
uintmax_t off = 0, slimit = 0;
struct option longopts[] = {
{ "all", 0, 0, 'a' },
-@@ -923,6 +1040,8 @@ main(int argc, char **argv) {
+@@ -996,6 +1113,8 @@ main(int argc, char **argv) {
{ "encryption", 1, 0, 'e' },
{ "find", 0, 0, 'f' },
{ "help", 0, 0, 'h' },
@@ -302,7 +302,7 @@
{ "associated", 1, 0, 'j' },
{ "offset", 1, 0, 'o' },
{ "sizelimit", 1, 0, 128 },
-@@ -939,12 +1058,13 @@ main(int argc, char **argv) {
+@@ -1012,12 +1131,13 @@ main(int argc, char **argv) {
capacity = delete = find = all = 0;
assoc = offset = sizelimit = encryption = passfd = NULL;
@@ -317,7 +317,7 @@
longopts, NULL)) != -1) {
switch (c) {
case 'a':
-@@ -969,6 +1089,12 @@ main(int argc, char **argv) {
+@@ -1045,6 +1165,12 @@ main(int argc, char **argv) {
case 'j':
assoc = optarg;
break;
@@ -330,36 +330,37 @@
case 'o':
offset = optarg;
break;
-@@ -1058,8 +1184,11 @@ main(int argc, char **argv) {
+@@ -1134,8 +1260,10 @@ main(int argc, char **argv) {
else {
if (passfd && sscanf(passfd, "%d", &pfd) != 1)
- usage();
+ usage(stderr);
+ if (keysize && sscanf(keysize,"%d",&keysz) != 1)
-+ usage();
++ usage(stderr);
do {
- res = set_loop(device, file, off, slimit, encryption, pfd, &ro);
-+ res = set_loop(device, file, off, slimit, encryption, phash,
-+ pfd, &ro, keysz);
++ res = set_loop(device, file, off, slimit, encryption, phash, pfd, &ro, keysz);
if (res == 2 && find) {
if (verbose)
printf(_("stolen loop=%s...trying again\n"),
-Index: util-linux-ng-2.18/mount/lomount.h
+Index: util-linux-2.19-rc1/mount/lomount.h
===================================================================
---- util-linux-ng-2.18.orig/mount/lomount.h
-+++ util-linux-ng-2.18/mount/lomount.h
-@@ -1,5 +1,6 @@
+--- util-linux-2.19-rc1.orig/mount/lomount.h
++++ util-linux-2.19-rc1/mount/lomount.h
+@@ -1,8 +1,8 @@
+ #ifndef UTIL_LINUX_LOMOUNT_H
+ #define UTIL_LINUX_LOMOUNT_H
+
-extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
- const char *, int, int *);
-+extern int set_loop(const char * device, const char * file, unsigned long long offset,
-+ unsigned long long, const char *encryption, const char *phash,
-+ int pfd, int *options, int keysz);
++extern int set_loop(const char * device, const char * file, unsigned long long offset, unsigned long long,
++ const char * encryption, const char *phash, int pfd, int *options, int keysz);
extern int del_loop(const char *);
extern int is_loop_device(const char *);
extern int is_loop_autoclear(const char *device);
-Index: util-linux-ng-2.18/mount/losetup.8
+Index: util-linux-2.19-rc1/mount/losetup.8
===================================================================
---- util-linux-ng-2.18.orig/mount/losetup.8
-+++ util-linux-ng-2.18/mount/losetup.8
+--- util-linux-2.19-rc1.orig/mount/losetup.8
++++ util-linux-2.19-rc1/mount/losetup.8
@@ -96,9 +96,18 @@ find the first unused loop device. If a
argument is present, use this device. Otherwise, print its name
.IP "\fB\-h, \-\-help\fP"
@@ -388,11 +389,11 @@
Cryptoloop is deprecated in favor of dm-crypt. For more details see
.BR cryptsetup (8).
-Index: util-linux-ng-2.18/mount/mount.8
+Index: util-linux-2.19-rc1/mount/mount.8
===================================================================
---- util-linux-ng-2.18.orig/mount/mount.8
-+++ util-linux-ng-2.18/mount/mount.8
-@@ -869,6 +869,15 @@ Every time the inode is modified, the i_
+--- util-linux-2.19-rc1.orig/mount/mount.8
++++ util-linux-2.19-rc1/mount/mount.8
+@@ -901,6 +901,15 @@ Every time the inode is modified, the i_
.B noiversion
Do not increment the i_version inode field.
.TP
@@ -408,7 +409,7 @@
.B mand
Allow mandatory locks on this filesystem. See
.BR fcntl (2).
-@@ -2582,6 +2591,10 @@ that are really options to
+@@ -2623,6 +2632,10 @@ that are really options to
.BR \%losetup (8).
(These options can be used in addition to those specific
to the filesystem type.)
@@ -419,11 +420,11 @@
Since Linux 2.6.25 is supported auto-destruction of loop devices and
then any loop device allocated by
-Index: util-linux-ng-2.18/mount/mount.c
+Index: util-linux-2.19-rc1/mount/mount.c
===================================================================
---- util-linux-ng-2.18.orig/mount/mount.c
-+++ util-linux-ng-2.18/mount/mount.c
-@@ -96,6 +96,9 @@ struct mountargs {
+--- util-linux-2.19-rc1.orig/mount/mount.c
++++ util-linux-2.19-rc1/mount/mount.c
+@@ -105,6 +105,9 @@ struct mountargs {
void *data;
};
@@ -433,7 +434,7 @@
/* Map from -o and fstab option strings to the flag argument to mount(2). */
struct opt_map {
const char *opt; /* option name */
-@@ -201,6 +204,7 @@ static int opt_nofail = 0;
+@@ -210,6 +213,7 @@ static int opt_nofail = 0;
static const char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_sizelimit,
*opt_encryption, *opt_speed, *opt_comment, *opt_uhelper;
@@ -441,7 +442,7 @@
static int is_readonly(const char *node);
static int mounted (const char *spec0, const char *node0);
-@@ -217,6 +221,8 @@ static struct string_opt_map {
+@@ -226,6 +230,8 @@ static struct string_opt_map {
{ "offset=", 0, &opt_offset },
{ "sizelimit=", 0, &opt_sizelimit },
{ "encryption=", 0, &opt_encryption },
@@ -450,7 +451,7 @@
{ "speed=", 0, &opt_speed },
{ "comment=", 1, &opt_comment },
{ "uhelper=", 0, &opt_uhelper },
-@@ -1116,7 +1122,8 @@ loop_check(const char **spec, const char
+@@ -1208,7 +1214,8 @@ loop_check(const char **spec, const char
*type = opt_vfstype;
}
@@ -460,7 +461,7 @@
*loopfile = *spec;
/* Automatically create a loop device from a regular file if a filesystem
-@@ -1170,7 +1177,7 @@ loop_check(const char **spec, const char
+@@ -1273,7 +1280,7 @@ loop_check(const char **spec, const char
printf(_("mount: going to use the loop device %s\n"), *loopdev);
if ((res = set_loop(*loopdev, *loopfile, offset, sizelimit,
@@ -469,7 +470,7 @@
if (res == 2) {
/* loop dev has been grabbed by some other process,
try again, if not given explicitly */
-@@ -1981,6 +1988,7 @@ static struct option longopts[] = {
+@@ -2209,6 +2216,7 @@ static struct option longopts[] = {
{ "options", 1, 0, 'o' },
{ "test-opts", 1, 0, 'O' },
{ "pass-fd", 1, 0, 'p' },
@@ -477,7 +478,7 @@
{ "types", 1, 0, 't' },
{ "bind", 0, 0, 'B' },
{ "move", 0, 0, 'M' },
-@@ -2143,6 +2151,7 @@ main(int argc, char *argv[]) {
+@@ -2372,6 +2380,7 @@ main(int argc, char *argv[]) {
char *options = NULL, *test_opts = NULL, *node;
const char *spec = NULL;
char *label = NULL;
@@ -485,7 +486,7 @@
char *uuid = NULL;
char *types = NULL;
char *p;
-@@ -2173,7 +2182,7 @@ main(int argc, char *argv[]) {
+@@ -2402,7 +2411,7 @@ main(int argc, char *argv[]) {
initproctitle(argc, argv);
#endif
@@ -494,7 +495,7 @@
longopts, NULL)) != -1) {
switch (c) {
case 'a': /* mount everything in fstab */
-@@ -2194,6 +2203,9 @@ main(int argc, char *argv[]) {
+@@ -2423,6 +2432,9 @@ main(int argc, char *argv[]) {
case 'i':
external_allowed = 0;
break;
@@ -504,7 +505,7 @@
case 'l':
list_with_volumelabel = 1;
break;
-@@ -2341,6 +2353,9 @@ main(int argc, char *argv[]) {
+@@ -2573,6 +2585,9 @@ main(int argc, char *argv[]) {
atexit(unlock_mtab);
@@ -514,10 +515,10 @@
switch (argc+specseen) {
case 0:
/* mount -a */
-Index: util-linux-ng-2.18/mount/rmd160.c
+Index: util-linux-2.19-rc1/mount/rmd160.c
===================================================================
--- /dev/null
-+++ util-linux-ng-2.18/mount/rmd160.c
++++ util-linux-2.19-rc1/mount/rmd160.c
@@ -0,0 +1,532 @@
+/* rmd160.c - RIPE-MD160
+ * Copyright (C) 1998 Free Software Foundation, Inc.
@@ -1051,10 +1052,10 @@
+ rmd160_final( &hd );
+ memcpy( outbuf, hd.buf, 20 );
+}
-Index: util-linux-ng-2.18/mount/rmd160.h
+Index: util-linux-2.19-rc1/mount/rmd160.h
===================================================================
--- /dev/null
-+++ util-linux-ng-2.18/mount/rmd160.h
++++ util-linux-2.19-rc1/mount/rmd160.h
@@ -0,0 +1,11 @@
+#ifndef RMD160_H
+#define RMD160_H
@@ -1067,10 +1068,10 @@
+#endif /*RMD160_H*/
+
+
-Index: util-linux-ng-2.18/mount/sha512.c
+Index: util-linux-2.19-rc1/mount/sha512.c
===================================================================
--- /dev/null
-+++ util-linux-ng-2.18/mount/sha512.c
++++ util-linux-2.19-rc1/mount/sha512.c
@@ -0,0 +1,432 @@
+/*
+ * sha512.c
@@ -1504,10 +1505,10 @@
+ memset(&ctx, 0, sizeof(ctx));
+}
+#endif
-Index: util-linux-ng-2.18/mount/sha512.h
+Index: util-linux-2.19-rc1/mount/sha512.h
===================================================================
--- /dev/null
-+++ util-linux-ng-2.18/mount/sha512.h
++++ util-linux-2.19-rc1/mount/sha512.h
@@ -0,0 +1,45 @@
+/*
+ * sha512.h
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org