mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-27 01:53:27 +01:00
Add info about offset when applying patches -- Take 2
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7205 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
25bc36dcc6
commit
9b9a2d0f13
@ -40,14 +40,14 @@ href="http://www1.shorewall.net/pub/shorewall/3.4/shorewall-3.4.6/errata/patches
|
|||||||
<p>Shorewall-shell version 4.0.0-4.0.2: <a
|
<p>Shorewall-shell version 4.0.0-4.0.2: <a
|
||||||
href="http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.2/errata/patches/Shorewall-shell/patch-shell-4.0.2-2.diff">http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.2/errata/patches/Shorewall-shell/patch-shell-4.0.2-2.diff</a></p>
|
href="http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.2/errata/patches/Shorewall-shell/patch-shell-4.0.2-2.diff">http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.2/errata/patches/Shorewall-shell/patch-shell-4.0.2-2.diff</a></p>
|
||||||
|
|
||||||
<p>Note that the patches may succeed with an offset when they are applied to
|
<p>Note that a patch may succeed with an offset when applied to a release
|
||||||
a release other than the one for which they were specifically prepared. For
|
other than the one for which it was specifically prepared. For example, when
|
||||||
example, when the patch for 3.2.0-3.4.3 is applied to release 3.4.3, the
|
the patch for 3.2.0-3.4.3 (which was prepared for release 3.2.10) is applied
|
||||||
following is the result:</p>
|
to release 3.4.3, the following is the result:</p>
|
||||||
<pre>teastep@wookie:~/shorewall/tags/3.4.3/Shorewall$ patch < ~/shorewall/tags/3.2.10/Shorewall.updated/patch-3.2.10-2.diff
|
<pre>root@wookie:/usr/share/shorewall$ patch < ~/shorewall/tags/3.2.10/Shorewall.updated/patch-3.2.10-2.diff
|
||||||
patching file compiler
|
patching file compiler
|
||||||
Hunk #1 succeeded at 958 (offset -1669 lines).
|
Hunk #1 succeeded at 958 (offset -1669 lines).
|
||||||
teastep@wookie:~/shorewall/tags/3.4.3/Shorewall$ cat ~/shorewall/tags/3.2.10/Shorewall.updated/patch-3.2.10-2.diff </pre>
|
root@wookie:/usr/share/shorewall$</pre>
|
||||||
<hr>
|
<hr>
|
||||||
|
|
||||||
<h2>Table of Contents</h2>
|
<h2>Table of Contents</h2>
|
||||||
|
Loading…
Reference in New Issue
Block a user