> Matt Zagni wrote:Is there an easy way to apply the diff's, or is it a manual
i went and got the JavaWebServer1.1 and applied the diffs from
http://www.blackdown.org/java-linux/products.html
most of the diffs succeeded so i guess i have done it correctly, but a number
of the diffs rejected:
it stopped at the start so i told it to look for startup_wrapper, but there is
no such file...
is the diff out of date?
===============================================
localhost:~/JWS/JavaWebServer1.1$ patch -p1 < jwebs-linux.diff
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ../../sparc-S2/bin/startup_wrapper Thu Oct 30 14:42:05 1997
|+++ startup_wrapper Thu Mar 5 00:39:06 1998
--------------------------
File to patch: localhost:~/JWS/JavaWebServer1.1$ patch -p1 < jwebs-linux.diff
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ../../sparc-S2/bin/startup_wrapper Thu Oct 30 14:42:05 1997
|+++ startup_wrapper Thu Mar 5 00:39:06 1998
--------------------------
File to patch: startup_wrapper
No file found--skip this patch? [n] y
Skipping patch...
Hunk #1 ignored at 10.
Hunk #2 ignored at 87.
2 out of 2 hunks ignored--saving rejects to startup_wrapper.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|
|--- ./bin/jserv.cls Wed Feb 4 15:52:32 1998
|+++ ./bin/jserv Thu Mar 5 01:19:54 1998
--------------------------
Patching file bin/jserv using Plan A...
Hunk #1 succeeded at 560.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ./native/Makefile.lnx.cls Thu Mar 5 01:21:16 1998
|+++ ./native/Makefile.lnx Thu Mar 5 01:36:14 1998
--------------------------
(Creating file native/Makefile.lnx...)
Patching file native/Makefile.lnx using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ./native/UNIXUser.c.cls Wed Feb 4 15:34:15 1998
|+++ ./native/UNIXUser.c Thu Mar 5 01:28:16 1998
--------------------------
Patching file native/UNIXUser.c using Plan A...
Hunk #1 failed at 35.
1 out of 1 hunks failed--saving rejects to native/UNIXUser.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ./native/UNIXUserEnumeration.c.cls Wed Feb 4 15:34:15 1998
|+++ ./native/UNIXUserEnumeration.c Thu Mar 5 01:27:52 1998
--------------------------
Patching file native/UNIXUserEnumeration.c using Plan A...
Hunk #1 failed at 57.
1 out of 1 hunks failed--saving rejects to native/UNIXUserEnumeration.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- ./etc/java-server.startup.cls Wed Feb 4 15:53:24 1998
|+++ ./etc/java-server.startup Thu Mar 5 01:42:22 1998
--------------------------
Patching file etc/java-server.startup using Plan A...
Hunk #1 succeeded at 80.
Hunk #2 succeeded at 92.
Hunk #3 succeeded at 111.
Hunk #4 failed at 168.
1 out of 4 hunks failed--saving rejects to etc/java-server.startup.rej
done
