Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at Wed Aug 17 14:01:36 CEST 2011.
-------- --- util-linux/util-linux.changes 2011-08-10 15:51:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2011-08-17 12:46:34.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Aug 17 10:37:20 UTC 2011 - pu...@novell.com + +- update to util-linux-2.20-rc2 + - bugfixes +- drop patches: + - util-linux-fix-manpages.patch + - util-linux-wall-build-with-pie.patch + - util-linux-2.20-rc1-agetty-fixes.patch + - util-linux-2.20-rc1-hexdump-segfault.patch + - util-linux-2.20-rc-fix-dmesg.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- util-linux-2.20-rc-fix-dmesg.patch util-linux-2.20-rc1-agetty-fixes.patch util-linux-2.20-rc1-hexdump-segfault.patch util-linux-2.20-rc1.tar.bz2 util-linux-fix-manpages.patch util-linux-wall-build-with-pie.patch New: ---- util-linux-2.20-rc2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.ak1uxU/_old 2011-08-17 14:01:09.000000000 +0200 +++ /var/tmp/diff_new_pack.ak1uxU/_new 2011-08-17 14:01:09.000000000 +0200 @@ -19,7 +19,7 @@ %define time_ver 1.7 %define which_ver 2.20 %define adjtimex_ver 1.28 -%define util_linux_tar_ver 2.20-rc1 +%define util_linux_tar_ver 2.20-rc2 Name: util-linux BuildRequires: audit-devel @@ -32,7 +32,7 @@ BuildRequires: readline-devel BuildRequires: zlib-devel Version: 2.19.91 -Release: 2 +Release: 4 Url: http://kernel.org/~kzak/util-linux/ Supplements: filesystem(minix) Provides: fsck-with-dev-lock = %{version} @@ -81,14 +81,7 @@ Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch # crypto patch Patch2: util-linux-2.17.1-mount_losetup_crypto.patch -Patch3: util-linux-fix-manpages.patch -Patch4: util-linux-wall-build-with-pie.patch -# bnc#711240 - squashed 4 upstream patches -Patch5: util-linux-2.20-rc1-agetty-fixes.patch -# bnc#710471 -Patch6: util-linux-2.20-rc-fix-dmesg.patch -# bnc#710877 -Patch7: util-linux-2.20-rc1-hexdump-segfault.patch + ## ## adjtimex ## @@ -189,11 +182,6 @@ %setup -q -a 9 -b 11 -b 12 -b 13 -n %{name}-%{util_linux_tar_ver} %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 # cd adjtimex-* @@ -458,7 +446,6 @@ %defattr(-,root,root) %doc login-utils/README.poeigl %doc misc-utils/README.cal -%doc misc-utils/README.namei %doc mount/README.mount %doc hwclock/README.hwclock %doc text-utils/README.col ++++++ util-linux-2.17.1-mount_losetup_crypto.patch ++++++ --- /var/tmp/diff_new_pack.ak1uxU/_old 2011-08-17 14:01:10.000000000 +0200 +++ /var/tmp/diff_new_pack.ak1uxU/_new 2011-08-17 14:01:10.000000000 +0200 @@ -38,10 +38,10 @@ create mode 100644 mount/sha512.c create mode 100644 mount/sha512.h -Index: util-linux-2.20-rc1/mount/Makefile.am +Index: util-linux-2.20-rc2/mount/Makefile.am =================================================================== ---- util-linux-2.20-rc1.orig/mount/Makefile.am -+++ util-linux-2.20-rc1/mount/Makefile.am +--- util-linux-2.20-rc2.orig/mount/Makefile.am ++++ util-linux-2.20-rc2/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-2.20-rc1/mount/lomount.c +Index: util-linux-2.20-rc2/mount/lomount.c =================================================================== ---- util-linux-2.20-rc1.orig/mount/lomount.c -+++ util-linux-2.20-rc1/mount/lomount.c +--- util-linux-2.20-rc2.orig/mount/lomount.c ++++ util-linux-2.20-rc2/mount/lomount.c @@ -23,6 +23,12 @@ #include "sundries.h" #include "xmalloc.h" @@ -68,7 +68,7 @@ #ifdef LOOP_SET_FD -@@ -509,12 +515,22 @@ show_loop_fd(int fd, char *device) { +@@ -510,12 +516,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; -@@ -764,7 +780,7 @@ xgetpass(int pfd, const char *prompt) { +@@ -765,7 +781,7 @@ xgetpass(int pfd, const char *prompt) { } if (pass == NULL) @@ -103,7 +103,7 @@ pass[i] = 0; return pass; -@@ -778,6 +794,24 @@ digits_only(const char *s) { +@@ -779,6 +795,24 @@ digits_only(const char *s) { return 1; } @@ -128,7 +128,7 @@ /* * return codes: * 0 - success -@@ -786,10 +820,11 @@ digits_only(const char *s) { +@@ -787,10 +821,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) { -@@ -827,13 +862,37 @@ set_loop(const char *device, const char +@@ -828,13 +863,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 @@ } } -@@ -854,20 +913,69 @@ set_loop(const char *device, const char +@@ -855,20 +914,69 @@ set_loop(const char *device, const char } #endif @@ -264,21 +264,34 @@ } if (ioctl(fd, LOOP_SET_FD, ffd) < 0) { -@@ -1022,7 +1130,13 @@ usage(FILE *f) { +@@ -1024,14 +1132,20 @@ usage(FILE *out) { + progname); - fprintf(f, _("\nOptions:\n" - " -e | --encryption <type> enable data encryption with specified <name/num>\n" -+ " -H | --phash <type> hash password using specified algorithm (sha512/sha256/sha384/rmd160/none)\n" - " -h | --help this help\n" -+ " -k | --keybits <num> specify number of bits in the hashed key given\n" -+ " to the cipher. Some ciphers support several key\n" -+ " sizes and might be more efficient with a smaller\n" -+ " key size. Key sizes < 128 are generally not\n" -+ " recommended\n" - " -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" -@@ -1036,11 +1150,14 @@ usage(FILE *f) { + fputs(_("\nOptions:\n"), out); +- fputs(_(" -e, --encryption <type> enable data encryption with specified <name/num>\n" +- " -h, --help this help\n" +- " -o, --offset <num> start at offset <num> into file\n" ++ fputs(_(" -e | --encryption <type> enable data encryption with specified <name/num>\n" ++ " -H | --phash <type> hash password using specified algorithm (sha512/sha256/sha384/rmd160/none)\n" ++ " -h | --help this help\n" ++ " -k | --keybits <num> specify number of bits in the hashed key given\n" ++ " to the cipher. Some ciphers support several key\n" ++ " sizes and might be more efficient with a smaller\n" ++ " key size. Key sizes < 128 are generally not\n" ++ " recommended\n" ++ " -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" +- " -r, --read-only setup read-only loop device\n" ++ " -p | --pass-fd <num> read passphrase from file descriptor <num>\n" ++ " -r | --read-only setup read-only loop device\n" + " --show print device name (with -f <file>)\n" +- " -v, --verbose verbose mode\n\n"), out); ++ " -v | --verbose verbose mode\n\n"), out); + + exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); + } +@@ -1039,11 +1153,14 @@ usage(FILE *out) { int main(int argc, char **argv) { char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc; @@ -293,7 +306,7 @@ uintmax_t off = 0, slimit = 0; static const struct option longopts[] = { -@@ -1050,6 +1167,8 @@ main(int argc, char **argv) { +@@ -1053,6 +1170,8 @@ main(int argc, char **argv) { { "encryption", 1, 0, 'e' }, { "find", 0, 0, 'f' }, { "help", 0, 0, 'h' }, @@ -302,7 +315,7 @@ { "associated", 1, 0, 'j' }, { "offset", 1, 0, 'o' }, { "sizelimit", 1, 0, 128 }, -@@ -1066,12 +1185,13 @@ main(int argc, char **argv) { +@@ -1069,12 +1188,13 @@ main(int argc, char **argv) { capacity = delete = find = all = 0; assoc = offset = sizelimit = encryption = passfd = NULL; @@ -317,7 +330,7 @@ longopts, NULL)) != -1) { switch (c) { case 'a': -@@ -1099,6 +1219,12 @@ main(int argc, char **argv) { +@@ -1102,6 +1222,12 @@ main(int argc, char **argv) { case 'j': assoc = optarg; break; @@ -330,7 +343,7 @@ case 'o': offset = optarg; break; -@@ -1188,8 +1314,10 @@ main(int argc, char **argv) { +@@ -1191,8 +1317,10 @@ main(int argc, char **argv) { else { if (passfd && sscanf(passfd, "%d", &pfd) != 1) usage(stderr); @@ -342,10 +355,10 @@ if (res == 2 && find) { if (verbose) printf(_("stolen loop=%s...trying again\n"), -Index: util-linux-2.20-rc1/mount/lomount.h +Index: util-linux-2.20-rc2/mount/lomount.h =================================================================== ---- util-linux-2.20-rc1.orig/mount/lomount.h -+++ util-linux-2.20-rc1/mount/lomount.h +--- util-linux-2.20-rc2.orig/mount/lomount.h ++++ util-linux-2.20-rc2/mount/lomount.h @@ -1,8 +1,8 @@ #ifndef UTIL_LINUX_LOMOUNT_H #define UTIL_LINUX_LOMOUNT_H @@ -357,10 +370,10 @@ extern int del_loop(const char *); extern int is_loop_device(const char *); extern int is_loop_autoclear(const char *device); -Index: util-linux-2.20-rc1/mount/losetup.8 +Index: util-linux-2.20-rc2/mount/losetup.8 =================================================================== ---- util-linux-2.20-rc1.orig/mount/losetup.8 -+++ util-linux-2.20-rc1/mount/losetup.8 +--- util-linux-2.20-rc2.orig/mount/losetup.8 ++++ util-linux-2.20-rc2/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" @@ -389,10 +402,10 @@ Cryptoloop is deprecated in favor of dm-crypt. For more details see .BR cryptsetup (8). -Index: util-linux-2.20-rc1/mount/mount.8 +Index: util-linux-2.20-rc2/mount/mount.8 =================================================================== ---- util-linux-2.20-rc1.orig/mount/mount.8 -+++ util-linux-2.20-rc1/mount/mount.8 +--- util-linux-2.20-rc2.orig/mount/mount.8 ++++ util-linux-2.20-rc2/mount/mount.8 @@ -915,6 +915,15 @@ Every time the inode is modified, the i_ .B noiversion Do not increment the i_version inode field. @@ -420,10 +433,10 @@ Since Linux 2.6.25 is supported auto-destruction of loop devices and then any loop device allocated by -Index: util-linux-2.20-rc1/mount/mount.c +Index: util-linux-2.20-rc2/mount/mount.c =================================================================== ---- util-linux-2.20-rc1.orig/mount/mount.c -+++ util-linux-2.20-rc1/mount/mount.c +--- util-linux-2.20-rc2.orig/mount/mount.c ++++ util-linux-2.20-rc2/mount/mount.c @@ -105,6 +105,9 @@ struct mountargs { void *data; }; @@ -515,10 +528,10 @@ switch (argc+specseen) { case 0: /* mount -a */ -Index: util-linux-2.20-rc1/mount/rmd160.c +Index: util-linux-2.20-rc2/mount/rmd160.c =================================================================== --- /dev/null -+++ util-linux-2.20-rc1/mount/rmd160.c ++++ util-linux-2.20-rc2/mount/rmd160.c @@ -0,0 +1,532 @@ +/* rmd160.c - RIPE-MD160 + * Copyright (C) 1998 Free Software Foundation, Inc. @@ -1052,10 +1065,10 @@ + rmd160_final( &hd ); + memcpy( outbuf, hd.buf, 20 ); +} -Index: util-linux-2.20-rc1/mount/rmd160.h +Index: util-linux-2.20-rc2/mount/rmd160.h =================================================================== --- /dev/null -+++ util-linux-2.20-rc1/mount/rmd160.h ++++ util-linux-2.20-rc2/mount/rmd160.h @@ -0,0 +1,11 @@ +#ifndef RMD160_H +#define RMD160_H @@ -1068,10 +1081,10 @@ +#endif /*RMD160_H*/ + + -Index: util-linux-2.20-rc1/mount/sha512.c +Index: util-linux-2.20-rc2/mount/sha512.c =================================================================== --- /dev/null -+++ util-linux-2.20-rc1/mount/sha512.c ++++ util-linux-2.20-rc2/mount/sha512.c @@ -0,0 +1,432 @@ +/* + * sha512.c @@ -1505,10 +1518,10 @@ + memset(&ctx, 0, sizeof(ctx)); +} +#endif -Index: util-linux-2.20-rc1/mount/sha512.h +Index: util-linux-2.20-rc2/mount/sha512.h =================================================================== --- /dev/null -+++ util-linux-2.20-rc1/mount/sha512.h ++++ util-linux-2.20-rc2/mount/sha512.h @@ -0,0 +1,45 @@ +/* + * sha512.h ++++++ util-linux-2.20-rc1.tar.bz2 -> util-linux-2.20-rc2.tar.bz2 ++++++ ++++ 181142 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
