pool/util-linux
SHA256
2
0
Fork 4
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bnc#655804

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=58
This commit is contained in:
Petr Uzel 2010-11-30 12:37:57 +00:00 committed by Git OBS Bridge
parent 3e18c572fe
commit 4ebf1f5484
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
util-linux-2.17.1-mount_losetup_crypto.patch
View File

@ -40,8 +40,8 @@ Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de>
Index: util-linux-ng-2.18/mount/Makefile.am Index: util-linux-ng-2.18/mount/Makefile.am
=================================================================== ===================================================================
--- util-linux-ng-2.18.orig/mount/Makefile.am 2010-05-24 12:35:47.000000000 +0200 --- util-linux-ng-2.18.orig/mount/Makefile.am
+++ util-linux-ng-2.18/mount/Makefile.am 2010-07-08 14:39:01.000000000 +0200 +++ util-linux-ng-2.18/mount/Makefile.am
@@ -7,7 +7,7 @@ sbin_PROGRAMS = losetup swapon @@ -7,7 +7,7 @@ sbin_PROGRAMS = losetup swapon
dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8 dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
@ -53,8 +53,8 @@ Index: util-linux-ng-2.18/mount/Makefile.am
hdrs_mount = fstab.h mount_mntent.h mount_constants.h \ hdrs_mount = fstab.h mount_mntent.h mount_constants.h \
Index: util-linux-ng-2.18/mount/lomount.c Index: util-linux-ng-2.18/mount/lomount.c
=================================================================== ===================================================================
--- util-linux-ng-2.18.orig/mount/lomount.c 2010-05-19 23:36:23.000000000 +0200 --- util-linux-ng-2.18.orig/mount/lomount.c
+++ util-linux-ng-2.18/mount/lomount.c 2010-07-08 14:39:29.000000000 +0200 +++ util-linux-ng-2.18/mount/lomount.c
@@ -23,6 +23,12 @@ @@ -23,6 +23,12 @@
#include "sundries.h" #include "sundries.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -182,7 +182,7 @@ Index: util-linux-ng-2.18/mount/lomount.c
} }
} }
@@ -734,20 +793,70 @@ set_loop(const char *device, const char @@ -734,20 +793,69 @@ set_loop(const char *device, const char
} }
#endif #endif
@ -226,7 +226,6 @@ Index: util-linux-ng-2.18/mount/lomount.c
+ +
+ if(!loopinfo64.lo_encrypt_key_size) { + if(!loopinfo64.lo_encrypt_key_size) {
+ if(!keysz) { + if(!keysz) {
+ if(verbose)
+ fprintf(stderr, _("please specify a key length\n")); + fprintf(stderr, _("please specify a key length\n"));
+ return 1; + return 1;
+ } + }
@ -265,7 +264,7 @@ Index: util-linux-ng-2.18/mount/lomount.c
} }
if (ioctl(fd, LOOP_SET_FD, ffd) < 0) { if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
@@ -897,7 +1006,13 @@ usage(void) { @@ -897,7 +1005,13 @@ usage(void) {
fprintf(stderr, _("\nOptions:\n" fprintf(stderr, _("\nOptions:\n"
" -e | --encryption <type> enable data encryption with specified <name/num>\n" " -e | --encryption <type> enable data encryption with specified <name/num>\n"
@ -279,7 +278,7 @@ Index: util-linux-ng-2.18/mount/lomount.c
" -o | --offset <num> start at offset <num> into file\n" " -o | --offset <num> start at offset <num> into file\n"
" --sizelimit <num> loop limited to only <num> bytes of the 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" " -p | --pass-fd <num> read passphrase from file descriptor <num>\n"
@@ -910,11 +1025,14 @@ usage(void) { @@ -910,11 +1024,14 @@ usage(void) {
int int
main(int argc, char **argv) { main(int argc, char **argv) {
char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc; char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc;
@ -294,7 +293,7 @@ Index: util-linux-ng-2.18/mount/lomount.c
uintmax_t off = 0, slimit = 0; uintmax_t off = 0, slimit = 0;
struct option longopts[] = { struct option longopts[] = {
{ "all", 0, 0, 'a' }, { "all", 0, 0, 'a' },
@@ -923,6 +1041,8 @@ main(int argc, char **argv) { @@ -923,6 +1040,8 @@ main(int argc, char **argv) {
{ "encryption", 1, 0, 'e' }, { "encryption", 1, 0, 'e' },
{ "find", 0, 0, 'f' }, { "find", 0, 0, 'f' },
{ "help", 0, 0, 'h' }, { "help", 0, 0, 'h' },
@ -303,7 +302,7 @@ Index: util-linux-ng-2.18/mount/lomount.c
{ "associated", 1, 0, 'j' }, { "associated", 1, 0, 'j' },
{ "offset", 1, 0, 'o' }, { "offset", 1, 0, 'o' },
{ "sizelimit", 1, 0, 128 }, { "sizelimit", 1, 0, 128 },
@@ -939,12 +1059,13 @@ main(int argc, char **argv) { @@ -939,12 +1058,13 @@ main(int argc, char **argv) {
capacity = delete = find = all = 0; capacity = delete = find = all = 0;
assoc = offset = sizelimit = encryption = passfd = NULL; assoc = offset = sizelimit = encryption = passfd = NULL;
@ -318,7 +317,7 @@ Index: util-linux-ng-2.18/mount/lomount.c
longopts, NULL)) != -1) { longopts, NULL)) != -1) {
switch (c) { switch (c) {
case 'a': case 'a':
@@ -969,6 +1090,12 @@ main(int argc, char **argv) { @@ -969,6 +1089,12 @@ main(int argc, char **argv) {
case 'j': case 'j':
assoc = optarg; assoc = optarg;
break; break;
@ -331,7 +330,7 @@ Index: util-linux-ng-2.18/mount/lomount.c
case 'o': case 'o':
offset = optarg; offset = optarg;
break; break;
@@ -1058,8 +1185,11 @@ main(int argc, char **argv) { @@ -1058,8 +1184,11 @@ main(int argc, char **argv) {
else { else {
if (passfd && sscanf(passfd, "%d", &pfd) != 1) if (passfd && sscanf(passfd, "%d", &pfd) != 1)
usage(); usage();
@ -346,8 +345,8 @@ Index: util-linux-ng-2.18/mount/lomount.c
printf(_("stolen loop=%s...trying again\n"), printf(_("stolen loop=%s...trying again\n"),
Index: util-linux-ng-2.18/mount/lomount.h Index: util-linux-ng-2.18/mount/lomount.h
=================================================================== ===================================================================
--- util-linux-ng-2.18.orig/mount/lomount.h 2010-02-04 12:53:56.000000000 +0100 --- util-linux-ng-2.18.orig/mount/lomount.h
+++ util-linux-ng-2.18/mount/lomount.h 2010-07-08 14:38:38.000000000 +0200 +++ util-linux-ng-2.18/mount/lomount.h
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
-extern int set_loop(const char *, const char *, unsigned long long, unsigned long long, -extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
- const char *, int, int *); - const char *, int, int *);
@ -359,8 +358,8 @@ Index: util-linux-ng-2.18/mount/lomount.h
extern int is_loop_autoclear(const char *device); extern int is_loop_autoclear(const char *device);
Index: util-linux-ng-2.18/mount/losetup.8 Index: util-linux-ng-2.18/mount/losetup.8
=================================================================== ===================================================================
--- util-linux-ng-2.18.orig/mount/losetup.8 2010-05-19 23:36:23.000000000 +0200 --- util-linux-ng-2.18.orig/mount/losetup.8
+++ util-linux-ng-2.18/mount/losetup.8 2010-07-08 14:38:38.000000000 +0200 +++ util-linux-ng-2.18/mount/losetup.8
@@ -96,9 +96,18 @@ find the first unused loop device. If a @@ -96,9 +96,18 @@ find the first unused loop device. If a
argument is present, use this device. Otherwise, print its name argument is present, use this device. Otherwise, print its name
.IP "\fB\-h, \-\-help\fP" .IP "\fB\-h, \-\-help\fP"
@ -391,8 +390,8 @@ Index: util-linux-ng-2.18/mount/losetup.8
.BR cryptsetup (8). .BR cryptsetup (8).
Index: util-linux-ng-2.18/mount/mount.8 Index: util-linux-ng-2.18/mount/mount.8
=================================================================== ===================================================================
--- util-linux-ng-2.18.orig/mount/mount.8 2010-06-30 10:41:35.000000000 +0200 --- util-linux-ng-2.18.orig/mount/mount.8
+++ util-linux-ng-2.18/mount/mount.8 2010-07-08 14:38:38.000000000 +0200 +++ util-linux-ng-2.18/mount/mount.8
@@ -869,6 +869,15 @@ Every time the inode is modified, the i_ @@ -869,6 +869,15 @@ Every time the inode is modified, the i_
.B noiversion .B noiversion
Do not increment the i_version inode field. Do not increment the i_version inode field.
@ -422,8 +421,8 @@ Index: util-linux-ng-2.18/mount/mount.8
then any loop device allocated by then any loop device allocated by
Index: util-linux-ng-2.18/mount/mount.c Index: util-linux-ng-2.18/mount/mount.c
=================================================================== ===================================================================
--- util-linux-ng-2.18.orig/mount/mount.c 2010-06-30 12:51:09.000000000 +0200 --- util-linux-ng-2.18.orig/mount/mount.c
+++ util-linux-ng-2.18/mount/mount.c 2010-07-08 14:38:38.000000000 +0200 +++ util-linux-ng-2.18/mount/mount.c
@@ -96,6 +96,9 @@ struct mountargs { @@ -96,6 +96,9 @@ struct mountargs {
void *data; void *data;
}; };
@ -517,8 +516,8 @@ Index: util-linux-ng-2.18/mount/mount.c
/* mount -a */ /* mount -a */
Index: util-linux-ng-2.18/mount/rmd160.c Index: util-linux-ng-2.18/mount/rmd160.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ util-linux-ng-2.18/mount/rmd160.c 2010-07-08 14:38:38.000000000 +0200 +++ util-linux-ng-2.18/mount/rmd160.c
@@ -0,0 +1,532 @@ @@ -0,0 +1,532 @@
+/* rmd160.c - RIPE-MD160 +/* rmd160.c - RIPE-MD160
+ * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1998 Free Software Foundation, Inc.
@ -1054,8 +1053,8 @@ Index: util-linux-ng-2.18/mount/rmd160.c
+} +}
Index: util-linux-ng-2.18/mount/rmd160.h Index: util-linux-ng-2.18/mount/rmd160.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ util-linux-ng-2.18/mount/rmd160.h 2010-07-08 14:38:38.000000000 +0200 +++ util-linux-ng-2.18/mount/rmd160.h
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#ifndef RMD160_H +#ifndef RMD160_H
+#define RMD160_H +#define RMD160_H
@ -1070,8 +1069,8 @@ Index: util-linux-ng-2.18/mount/rmd160.h
+ +
Index: util-linux-ng-2.18/mount/sha512.c Index: util-linux-ng-2.18/mount/sha512.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ util-linux-ng-2.18/mount/sha512.c 2010-07-08 14:38:38.000000000 +0200 +++ util-linux-ng-2.18/mount/sha512.c
@@ -0,0 +1,432 @@ @@ -0,0 +1,432 @@
+/* +/*
+ * sha512.c + * sha512.c
@ -1507,8 +1506,8 @@ Index: util-linux-ng-2.18/mount/sha512.c
+#endif +#endif
Index: util-linux-ng-2.18/mount/sha512.h Index: util-linux-ng-2.18/mount/sha512.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ util-linux-ng-2.18/mount/sha512.h 2010-07-08 14:38:38.000000000 +0200 +++ util-linux-ng-2.18/mount/sha512.h
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
+/* +/*
+ * sha512.h + * sha512.h

5
util-linux.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 30 12:19:53 UTC 2010 - puzel@novell.com
- update util-linux-2.17.1-mount_losetup_crypto.patch (bnc#655804)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 26 19:10:27 CET 2010 - kay.sievers@novell.com Fri Nov 26 19:10:27 CET 2010 - kay.sievers@novell.com