version 1.38, 2015/07/02 05:49:04 |
version 1.39, 2016/01/31 01:13:42 |
|
|
which post-release changes have made it into the patch branch. --> |
which post-release changes have made it into the patch branch. --> |
As a general principle, all |
As a general principle, all |
<a href="errata.html">errata</a> entries will be merged into the patch |
<a href="errata.html">errata</a> entries will be merged into the patch |
branch within 48 hours of when an errata is published. Other post release |
branch within 48 hours of when an errata is published. Other post-release |
patches may be merged in as well, subject to a number of conditions: |
patches may be merged in as well, subject to a number of conditions: |
<ul> |
<ul> |
<li>The patches must be simple, short, and obviously 100% correct. |
<li>The patches must be simple, short, and obviously 100% correct. |
|
|
<i>not</i> be merged. |
<i>not</i> be merged. |
In general, if it requires a man page change, it will NOT be a |
In general, if it requires a man page change, it will NOT be a |
candidate for the patch branch. |
candidate for the patch branch. |
<li>As an exception to the above rules, OpenSSH release versions will be |
|
merged into the patch branch. |
|
</ul> |
</ul> |
<p> |
<p> |
|
|
|
|
<p> |
<p> |
To obtain the patch branch for a particular release of OpenBSD, you |
To obtain the patch branch for a particular release of OpenBSD, you |
can update on top of a pre-existing source tree |
can update on top of a pre-existing source tree |
(from <a href="ftp.html">FTP</a> or the <a href="orders.html">CD</a>) |
(from <a href="ftp.html">a mirror</a> or the <a href="orders.html">CD</a>) |
or you can grab the source tree freshly from |
or you can grab the source tree freshly from |
an <a href="anoncvs.html">AnonCVS</a> server. |
an <a href="anoncvs.html">AnonCVS</a> server. |
Instructions for getting the patch branch and staying up to date are |
Instructions for getting the patch branch and staying up to date are |
described in the <b>Getting Started</b> section of the |
described in the <b>Getting Started</b> section of the |
<a href="anoncvs.html#starting">AnonCVS documentation</a>. |
<a href="anoncvs.html#starting">AnonCVS documentation</a>. |
Note that patch branches do not help to upgrade from one release of |
Note that patch branches do not help to upgrade from one release of |
OpenBSD to another, e.g. to go from 5.4 to 5.5. They only provide |
OpenBSD to another. They only provide a means for staying up to date |
a means for staying up to date with the patches within a given release. |
with the patches within a given release. |
|
|
<p> |
<p> |
Do not attempt to go from one release to another via source. |
Do not attempt to go from one release to another via source. |
Instead, please visit the <a href="faq/upgrade55.html">upgrade guide</a>. |
Instead, please read the upgrade guide for the release in question. |
Also, you cannot go backwards, from -current back to -stable, because of |
Also, you cannot go backwards, from -current back to -stable, because of |
library versioning problems and other changes. |
library versioning problems and other changes. |
|
|
|
|
This is a simplified summary. |
This is a simplified summary. |
|
|
<p> |
<p> |
Once you have obtained a source tree via <a href="anoncvs.html">anoncvs</a>, |
Once you have obtained a source tree via <a href="anoncvs.html">AnonCVS</a>, |
you must rebuild the system. The stages for doing so are: |
you must rebuild the system. The stages for doing so are: |
|
|
<ul> |
<ul> |