Hi,
I hope somebody can help me.
I have a self-compiled kernel 2.4.20 on RH80 with
patch-int.2.4.20.1
loop-jari-2.4.20.0
Now I am trying to patch the util-linux package (util-linux-2.11r-10.src.rpm)
to get crypto support for mount, losetup and others (?), but while I am
patching I get the following error message:
patching file mount/Makefile
patching file mount/lomount.c
Hunk #4 succeeded at 243 with fuzz 1.
Hunk #5 succeeded at 317 (offset 1 line).
Hunk #7 succeeded at 486 (offset 1 line).
Hunk #9 succeeded at 622 (offset 1 line).
Hunk #11 succeeded at 715 (offset 1 line).
Hunk #13 succeeded at 746 (offset 1 line).
patching file mount/lomount.h
patching file mount/losetup.8
patching file mount/mount.8
Hunk #1 succeeded at 259 (offset 1 line).
Hunk #2 succeeded at 635 (offset 66 lines).
Hunk #3 succeeded at 1615 (offset 18 lines).
patching file mount/mount.c
Hunk #1 succeeded at 110 (offset 2 lines).
Hunk #2 succeeded at 190 (offset 3 lines).
Hunk #3 succeeded at 200 (offset 2 lines).
Hunk #4 succeeded at 552 (offset 3 lines).
Hunk #5 succeeded at 594 (offset 2 lines).
Hunk #6 FAILED at 1326.
Hunk #7 succeeded at 1370 (offset 10 lines).
Hunk #8 succeeded at 1378 with fuzz 2 (offset 2 lines).
Hunk #9 FAILED at 1400.
Hunk #10 succeeded at 1444 with fuzz 2 (offset 16 lines).
Hunk #11 succeeded at 1538 (offset 2 lines).
2 out of 11 hunks FAILED -- saving rejects to file mount/mount.c.rej
patching file mount/rmd160.c
patching file mount/rmd160.h
patching file mount/sha512.c
patching file mount/sha512.h
patching file mount/sundries.c
As you can see there are 2 errors.
mount/mount.c.rej :
***************
*** 1318,1323 ****
{ "read-write", 0, 0, 'w' },
{ "rw", 0, 0, 'w' },
{ "options", 1, 0, 'o' },
{ "types", 1, 0, 't' },
{ "bind", 0, 0, 128 },
{ "replace", 0, 0, 129 },
--- 1326,1332 ----
{ "read-write", 0, 0, 'w' },
{ "rw", 0, 0, 'w' },
{ "options", 1, 0, 'o' },
+ { "pass-fd", 1, 0, 'p' },
{ "types", 1, 0, 't' },
{ "bind", 0, 0, 128 },
{ "replace", 0, 0, 129 },
***************
*** 1390,1396 ****
initproctitle(argc, argv);
#endif
- while ((c = getopt_long (argc, argv, "afFhlL:no:rsU:vVwt:",
longopts, NULL)) != -1) {
switch (c) {
case 'a': /* mount everything in fstab */
--- 1400,1406 ----
initproctitle(argc, argv);
#endif
+ while ((c = getopt_long (argc, argv, "afFhlL:no:p:rsU:vVwt:",
longopts, NULL)) != -1) {
switch (c) {
case 'a': /* mount everything in fstab */
Thank you in advance for your help.
Regards,
Robert
-
Linux-crypto: cryptography in and on the Linux system
Archive: http://mail.nl.linux.org/linux-crypto/
