testing/util-linux
SHA256
3
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

- refreshed patches with fuzz=0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=18
This commit is contained in:
Marcus Meissner 2009-11-15 13:05:00 +00:00 committed by Git OBS Bridge
parent 237c8f7ae0
commit 85504300d7
4 changed files with 80 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
util-linux-2.12-misc_utils_hostid.patch
View File

@ -1,7 +1,7 @@
Index: util-linux-ng-2.14/misc-utils/hostid.1
Index: util-linux-ng-2.16/misc-utils/hostid.1
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ util-linux-ng-2.14/misc-utils/hostid.1 2008-06-24 12:12:17.000000000 +0200
--- /dev/null
+++ util-linux-ng-2.16/misc-utils/hostid.1
@@ -0,0 +1,24 @@
+.TH hostid 1
+.SH NAME
@ -27,10 +27,10 @@ Index: util-linux-ng-2.14/misc-utils/hostid.1
+.SH SEE ALSO
+gethostid(2), sethostid(2)
+
Index: util-linux-ng-2.14/misc-utils/hostid.c
Index: util-linux-ng-2.16/misc-utils/hostid.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ util-linux-ng-2.14/misc-utils/hostid.c 2008-06-24 12:12:17.000000000 +0200
--- /dev/null
+++ util-linux-ng-2.16/misc-utils/hostid.c
@@ -0,0 +1,88 @@
+/* Program hostid. Changed on 7.10.1997 <ms@suse.de>
+ New: - Hostid 0 is not permitted.
@ -120,20 +120,20 @@ Index: util-linux-ng-2.14/misc-utils/hostid.c
+
+ return 0;
+}
Index: util-linux-ng-2.14/misc-utils/Makefile.am
Index: util-linux-ng-2.16/misc-utils/Makefile.am
===================================================================
--- util-linux-ng-2.14.orig/misc-utils/Makefile.am 2008-05-29 01:01:02.000000000 +0200
+++ util-linux-ng-2.14/misc-utils/Makefile.am 2008-06-24 12:13:45.000000000 +0200
@@ -4,7 +4,7 @@ EXTRA_DIST = README.flushb
bin_PROGRAMS =
--- util-linux-ng-2.16.orig/misc-utils/Makefile.am
+++ util-linux-ng-2.16/misc-utils/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS =
sbin_PROGRAMS =
usrsbin_exec_PROGRAMS =
-usrbin_exec_PROGRAMS = cal ddate logger look mcookie \
+usrbin_exec_PROGRAMS = cal ddate hostid logger look mcookie \
namei script whereis scriptreplay
EXTRA_DIST += README.cal README.ddate README.namei README.namei2
@@ -14,7 +14,7 @@ usrbinexec_SCRIPTS = chkdupexe
@@ -16,7 +16,7 @@ usrbin_exec_SCRIPTS = chkdupexe
CLEANFILES = chkdupexe
@ -141,4 +141,4 @@ Index: util-linux-ng-2.14/misc-utils/Makefile.am
+dist_man_MANS = cal.1 chkdupexe.1 ddate.1 hostid.1 logger.1 look.1 mcookie.1 \
namei.1 script.1 whereis.1 scriptreplay.1
if HAVE_TINFO
if BUILD_LIBUUID

10
util-linux-2.12r-fdisk_remove_bogus_warnings.patch
View File

@ -1,8 +1,8 @@
Index: util-linux-ng-2.12r+2.13pre7/fdisk/fdisk.c
Index: util-linux-ng-2.16/fdisk/fdisk.c
===================================================================
--- util-linux-ng-2.12r+2.13pre7.orig/fdisk/fdisk.c
+++ util-linux-ng-2.12r+2.13pre7/fdisk/fdisk.c
@@ -1498,6 +1498,7 @@ static void check_consistency(struct par
--- util-linux-ng-2.16.orig/fdisk/fdisk.c
+++ util-linux-ng-2.16/fdisk/fdisk.c
@@ -1586,6 +1586,7 @@ static void check_consistency(struct par
/* compute logical ending (c, h, s) */
long2chs(get_start_sect(p) + get_nr_sects(p) - 1, &lec, &leh, &les);
@ -10,7 +10,7 @@ Index: util-linux-ng-2.12r+2.13pre7/fdisk/fdisk.c
/* Same physical / logical beginning? */
if (cylinders <= 1024 && (pbc != lbc || pbh != lbh || pbs != lbs)) {
printf(_("Partition %d has different physical/logical "
@@ -1514,7 +1515,6 @@ static void check_consistency(struct par
@@ -1602,7 +1603,6 @@ static void check_consistency(struct par
printf(_("logical=(%d, %d, %d)\n"),lec, leh, les);
}

116
util-linux-mount_losetup_crypto.patch
View File

@ -35,10 +35,10 @@ Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de>
sha512.h | 45 +++++
10 files changed, 1219 insertions(+), 28 deletions(-)
diff --git a/mount/Makefile.am b/mount/Makefile.am
index b0e6374..5d5a682 100644
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
Index: util-linux-ng-2.16/mount/Makefile.am
===================================================================
--- util-linux-ng-2.16.orig/mount/Makefile.am
+++ util-linux-ng-2.16/mount/Makefile.am
@@ -7,7 +7,8 @@ sbin_PROGRAMS = losetup swapon
dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
@ -49,10 +49,10 @@ index b0e6374..5d5a682 100644
# generic header for mount and umount
hdrs_mount = fstab.h mount_mntent.h mount_constants.h \
diff --git a/mount/lomount.c b/mount/lomount.c
index 1b191ab..5c659cd 100644
--- a/mount/lomount.c
+++ b/mount/lomount.c
Index: util-linux-ng-2.16/mount/lomount.c
===================================================================
--- util-linux-ng-2.16.orig/mount/lomount.c
+++ util-linux-ng-2.16/mount/lomount.c
@@ -23,6 +23,12 @@
#include "sundries.h"
#include "xmalloc.h"
@ -66,7 +66,7 @@ index 1b191ab..5c659cd 100644
#define SIZE(a) (sizeof(a)/sizeof(a[0]))
@@ -394,12 +400,22 @@ show_loop_fd(int fd, char *device) {
@@ -392,12 +398,22 @@ show_loop_fd(int fd, char *device) {
if (loopinfo64.lo_encrypt_type ||
loopinfo64.lo_crypt_name[0]) {
@ -92,7 +92,7 @@ index 1b191ab..5c659cd 100644
}
printf("\n");
return 0;
@@ -655,7 +671,7 @@ xgetpass(int pfd, const char *prompt) {
@@ -646,7 +662,7 @@ xgetpass(int pfd, const char *prompt) {
}
if (pass == NULL)
@ -101,7 +101,7 @@ index 1b191ab..5c659cd 100644
pass[i] = 0;
return pass;
@@ -669,6 +685,24 @@ digits_only(const char *s) {
@@ -660,6 +676,24 @@ digits_only(const char *s) {
return 1;
}
@ -126,7 +126,7 @@ index 1b191ab..5c659cd 100644
/*
* return codes:
* 0 - success
@@ -677,10 +711,11 @@ digits_only(const char *s) {
@@ -668,10 +702,11 @@ digits_only(const char *s) {
*/
int
set_loop(const char *device, const char *file, unsigned long long offset,
@ -140,7 +140,7 @@ index 1b191ab..5c659cd 100644
char *filename;
if (verbose) {
@@ -718,13 +753,37 @@ set_loop(const char *device, const char *file, unsigned long long offset,
@@ -709,13 +744,37 @@ set_loop(const char *device, const char
filename = (char *) file;
xstrncpy((char *)loopinfo64.lo_file_name, filename, LO_NAME_SIZE);
@ -180,7 +180,7 @@ index 1b191ab..5c659cd 100644
}
}
@@ -745,20 +804,70 @@ set_loop(const char *device, const char *file, unsigned long long offset,
@@ -736,20 +795,70 @@ set_loop(const char *device, const char
}
#endif
@ -263,7 +263,7 @@ index 1b191ab..5c659cd 100644
}
if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
@@ -906,7 +1015,13 @@ usage(void) {
@@ -897,7 +1006,13 @@ usage(void) {
fprintf(stderr, _("\nOptions:\n"
" -e | --encryption <type> enable data encryption with specified <name/num>\n"
@ -277,7 +277,7 @@ index 1b191ab..5c659cd 100644
" -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"
@@ -919,11 +1034,14 @@ usage(void) {
@@ -910,11 +1025,14 @@ usage(void) {
int
main(int argc, char **argv) {
char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc;
@ -292,7 +292,7 @@ index 1b191ab..5c659cd 100644
unsigned long long off, slimit;
struct option longopts[] = {
{ "all", 0, 0, 'a' },
@@ -932,6 +1050,8 @@ main(int argc, char **argv) {
@@ -923,6 +1041,8 @@ main(int argc, char **argv) {
{ "encryption", 1, 0, 'e' },
{ "find", 0, 0, 'f' },
{ "help", 0, 0, 'h' },
@ -301,7 +301,7 @@ index 1b191ab..5c659cd 100644
{ "associated", 1, 0, 'j' },
{ "offset", 1, 0, 'o' },
{ "sizelimit", 1, 0, 128 },
@@ -950,12 +1070,13 @@ main(int argc, char **argv) {
@@ -941,12 +1061,13 @@ main(int argc, char **argv) {
off = 0;
slimit = 0;
assoc = offset = sizelimit = encryption = passfd = NULL;
@ -316,7 +316,7 @@ index 1b191ab..5c659cd 100644
longopts, NULL)) != -1) {
switch (c) {
case 'a':
@@ -980,6 +1101,12 @@ main(int argc, char **argv) {
@@ -971,6 +1092,12 @@ main(int argc, char **argv) {
case 'j':
assoc = optarg;
break;
@ -329,7 +329,7 @@ index 1b191ab..5c659cd 100644
case 'o':
offset = optarg;
break;
@@ -1065,8 +1192,11 @@ main(int argc, char **argv) {
@@ -1056,8 +1183,11 @@ main(int argc, char **argv) {
else {
if (passfd && sscanf(passfd, "%d", &pfd) != 1)
usage();
@ -342,10 +342,10 @@ index 1b191ab..5c659cd 100644
if (res == 2 && find) {
if (verbose)
printf(_("stolen loop=%s...trying again\n"),
diff --git a/mount/lomount.h b/mount/lomount.h
index 59108d4..07ab875 100644
--- a/mount/lomount.h
+++ b/mount/lomount.h
Index: util-linux-ng-2.16/mount/lomount.h
===================================================================
--- util-linux-ng-2.16.orig/mount/lomount.h
+++ util-linux-ng-2.16/mount/lomount.h
@@ -1,5 +1,6 @@
-extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
- const char *, int, int *);
@ -355,10 +355,10 @@ index 59108d4..07ab875 100644
extern int del_loop(const char *);
extern int is_loop_device(const char *);
extern int is_loop_autoclear(const char *device);
diff --git a/mount/losetup.8 b/mount/losetup.8
index f5d3e17..226f4f3 100644
--- a/mount/losetup.8
+++ b/mount/losetup.8
Index: util-linux-ng-2.16/mount/losetup.8
===================================================================
--- util-linux-ng-2.16.orig/mount/losetup.8
+++ util-linux-ng-2.16/mount/losetup.8
@@ -94,9 +94,18 @@ find the first unused loop device. If a
argument is present, use this device. Otherwise, print its name
.IP "\fB\-h, \-\-help\fP"
@ -387,11 +387,11 @@ index f5d3e17..226f4f3 100644
Cryptoloop is deprecated in favor of dm-crypt. For more details see
.B cryptsetup(8).
diff --git a/mount/mount.8 b/mount/mount.8
index 8e17549..ffe3cc5 100644
--- a/mount/mount.8
+++ b/mount/mount.8
@@ -782,6 +782,15 @@ Every time the inode is modified, the i_version field will be incremented.
Index: util-linux-ng-2.16/mount/mount.8
===================================================================
--- util-linux-ng-2.16.orig/mount/mount.8
+++ util-linux-ng-2.16/mount/mount.8
@@ -782,6 +782,15 @@ Every time the inode is modified, the i_
.B noiversion
Do not increment the i_version inode field.
.TP
@ -418,10 +418,10 @@ index 8e17549..ffe3cc5 100644
If no explicit loop device is mentioned
(but just an option `\fB\-o loop\fP' is given), then
diff --git a/mount/mount.c b/mount/mount.c
index c636e9d..2a69c38 100644
--- a/mount/mount.c
+++ b/mount/mount.c
Index: util-linux-ng-2.16/mount/mount.c
===================================================================
--- util-linux-ng-2.16.orig/mount/mount.c
+++ util-linux-ng-2.16/mount/mount.c
@@ -95,6 +95,9 @@ struct mountargs {
void *data;
};
@ -449,7 +449,7 @@ index c636e9d..2a69c38 100644
{ "speed=", 0, &opt_speed },
{ "comment=", 1, &opt_comment },
{ "uhelper=", 0, &opt_uhelper },
@@ -1072,7 +1078,8 @@ loop_check(const char **spec, const char **type, int *flags,
@@ -1072,7 +1078,8 @@ loop_check(const char **spec, const char
*type = opt_vfstype;
}
@ -459,7 +459,7 @@ index c636e9d..2a69c38 100644
*loopfile = *spec;
if (*loop) {
@@ -1104,7 +1111,7 @@ loop_check(const char **spec, const char **type, int *flags,
@@ -1104,7 +1111,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,
@ -468,7 +468,7 @@ index c636e9d..2a69c38 100644
if (res == 2) {
/* loop dev has been grabbed by some other process,
try again, if not given explicitly */
@@ -1861,6 +1868,7 @@ static struct option longopts[] = {
@@ -1865,6 +1872,7 @@ static struct option longopts[] = {
{ "options", 1, 0, 'o' },
{ "test-opts", 1, 0, 'O' },
{ "pass-fd", 1, 0, 'p' },
@ -476,7 +476,7 @@ index c636e9d..2a69c38 100644
{ "types", 1, 0, 't' },
{ "bind", 0, 0, 'B' },
{ "move", 0, 0, 'M' },
@@ -2022,6 +2030,7 @@ main(int argc, char *argv[]) {
@@ -2026,6 +2034,7 @@ main(int argc, char *argv[]) {
char *options = NULL, *test_opts = NULL, *node;
const char *spec = NULL;
char *label = NULL;
@ -484,7 +484,7 @@ index c636e9d..2a69c38 100644
char *uuid = NULL;
char *types = NULL;
char *p;
@@ -2052,7 +2061,7 @@ main(int argc, char *argv[]) {
@@ -2056,7 +2065,7 @@ main(int argc, char *argv[]) {
initproctitle(argc, argv);
#endif
@ -493,7 +493,7 @@ index c636e9d..2a69c38 100644
longopts, NULL)) != -1) {
switch (c) {
case 'a': /* mount everything in fstab */
@@ -2073,6 +2082,9 @@ main(int argc, char *argv[]) {
@@ -2077,6 +2086,9 @@ main(int argc, char *argv[]) {
case 'i':
external_allowed = 0;
break;
@ -503,7 +503,7 @@ index c636e9d..2a69c38 100644
case 'l':
list_with_volumelabel = 1;
break;
@@ -2211,6 +2223,9 @@ main(int argc, char *argv[]) {
@@ -2215,6 +2227,9 @@ main(int argc, char *argv[]) {
atexit(unlock_mtab);
@ -513,11 +513,10 @@ index c636e9d..2a69c38 100644
switch (argc+specseen) {
case 0:
/* mount -a */
diff --git a/mount/rmd160.c b/mount/rmd160.c
new file mode 100644
index 0000000..3430954
Index: util-linux-ng-2.16/mount/rmd160.c
===================================================================
--- /dev/null
+++ b/mount/rmd160.c
+++ util-linux-ng-2.16/mount/rmd160.c
@@ -0,0 +1,532 @@
+/* rmd160.c - RIPE-MD160
+ * Copyright (C) 1998 Free Software Foundation, Inc.
@ -1051,11 +1050,10 @@ index 0000000..3430954
+ rmd160_final( &hd );
+ memcpy( outbuf, hd.buf, 20 );
+}
diff --git a/mount/rmd160.h b/mount/rmd160.h
new file mode 100644
index 0000000..4b2c61d
Index: util-linux-ng-2.16/mount/rmd160.h
===================================================================
--- /dev/null
+++ b/mount/rmd160.h
+++ util-linux-ng-2.16/mount/rmd160.h
@@ -0,0 +1,11 @@
+#ifndef RMD160_H
+#define RMD160_H
@ -1068,11 +1066,10 @@ index 0000000..4b2c61d
+#endif /*RMD160_H*/
+
+
diff --git a/mount/sha512.c b/mount/sha512.c
new file mode 100644
index 0000000..f717c8b
Index: util-linux-ng-2.16/mount/sha512.c
===================================================================
--- /dev/null
+++ b/mount/sha512.c
+++ util-linux-ng-2.16/mount/sha512.c
@@ -0,0 +1,432 @@
+/*
+ * sha512.c
@ -1506,11 +1503,10 @@ index 0000000..f717c8b
+ memset(&ctx, 0, sizeof(ctx));
+}
+#endif
diff --git a/mount/sha512.h b/mount/sha512.h
new file mode 100644
index 0000000..4b57c01
Index: util-linux-ng-2.16/mount/sha512.h
===================================================================
--- /dev/null
+++ b/mount/sha512.h
+++ util-linux-ng-2.16/mount/sha512.h
@@ -0,0 +1,45 @@
+/*
+ * sha512.h

5
util-linux.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Nov 15 14:04:48 CET 2009 - meissner@suse.de
- refreshed patches with fuzz=0
-------------------------------------------------------------------
Mon Oct 26 17:45:53 UTC 2009 - crrodriguez@opensuse.org