diff options
| author | Richard Levitte <levitte@openssl.org> | 2022-07-12 14:39:09 +0300 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2022-07-20 14:10:20 +0300 |
| commit | 239296da4d2d17929d7b5285b749cdeef3e44ad6 (patch) | |
| tree | 54a96d639a37a0d35c03f8ecbce75b1581171be8 | |
| parent | e0824ffd90afab8425e01c90594c03b13d9d9975 (diff) | |
Convert all source/*.html to .md
Partial fix of #324
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/web/pull/349)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | source/dirdata.yaml | 12 | ||||
| -rw-r--r-- | source/gitrepo.html | 76 | ||||
| -rw-r--r-- | source/gitrepo.md | 44 | ||||
| -rw-r--r-- | source/index.html | 104 | ||||
| -rw-r--r-- | source/index.md | 68 | ||||
| -rw-r--r-- | source/license.html | 53 | ||||
| -rw-r--r-- | source/license.md | 20 | ||||
| -rw-r--r-- | source/mirror.html | 55 | ||||
| -rw-r--r-- | source/mirror.md | 23 | ||||
| -rw-r--r-- | source/sidebar.shtml | 28 |
12 files changed, 178 insertions, 317 deletions
@@ -35,6 +35,7 @@ policies/technical/*.html policies/technical/*.inc source/*.gz* source/*.patch +source/*.html source/.htaccess source/index.inc source/old/*/ @@ -72,6 +72,14 @@ H_POLICIES = $(addsuffix .html,\ $(basename $(shell git ls-files -- policies/*.md \ policies/general/*.md \ policies/technical/*.md))) +# We filter out any file starting with 'sub-'... they get special treatment +H_SOURCE= $(addsuffix .html,\ + $(basename $(shell git ls-files -- source/*.md \ + source/old/*.md \ + | grep -v '/sub-') \ + $(basename $(shell git ls-files -- source/*.md.tt \ + source/old/*.md.tt \ + | grep -v '/sub-')))) H_SUPPORT = $(addsuffix .html,$(basename $(shell git ls-files -- support/*.md))) SIMPLE = $(H_TOP) \ @@ -92,9 +100,9 @@ SIMPLE = $(H_TOP) \ $(foreach S,$(SERIES) $(OLDSERIES),news/vulnerabilities-$(S).html) \ $(H_POLICIES) \ policies/glossary.html \ + $(H_SOURCE) \ source/.htaccess \ source/index.inc \ - source/old/index.html \ $(H_SUPPORT) SRCLISTS = $(foreach S,$(FUTURESERIES) $(SERIES) $(OLDSERIES2) fips,source/old/$(S)/index.inc source/old/$(S)/index.html) @@ -561,5 +569,6 @@ $(foreach H, \ $(filter %.html,$(MANPAGES_TARGETS)) \ $(H_NEWS) \ $(H_POLICIES) \ + $(H_SOURCE) \ $(H_SUPPORT) \ ,$(eval $(call makehtmldepend,$(H)))) diff --git a/source/dirdata.yaml b/source/dirdata.yaml new file mode 100644 index 0000000..4b83803 --- /dev/null +++ b/source/dirdata.yaml @@ -0,0 +1,12 @@ +--- +breadcrumbs: | + [Home](/) : [Downloads](.) +sidebar: | + # [Downloads](.) + + - [Git Repository](gitrepo.html) + - [License](license.html) + - [OCB License](OCB-patent-grant-OpenSSL.pdf) + - [Old Releases](old/) + - [Mirror Sites](mirror.html) +--- diff --git a/source/gitrepo.html b/source/gitrepo.html deleted file mode 100644 index c097edf..0000000 --- a/source/gitrepo.html +++ /dev/null @@ -1,76 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<!--#include virtual="/inc/head.shtml" --> - -<body> -<!--#include virtual="/inc/banner.shtml" --> - - <div id="main"> - <div id="content"> - <div class="blog-index"> - <article> - <header><h2>Git Repository</h2></header> - - <div class="entry-content"> - <p>The OpenSSL software is developed using a Git repository. - Read-only access to the repository is available at - git.openssl.org. We also maintain a downstream clone on GitHub, at - <a - href="https://github.com/openssl/openssl">https://github.com/openssl/openssl</a> - on GitHub. This repository is updated with every commit and is - accessible through a number of protocols.</p> - - <p>On the OpenSSL repository we only support the <em>git</em> - protocol. Use the following command to clone the git repository - including all available branches and tags: - <code><pre> - -$ git clone git://git.openssl.org/openssl.git - </pre></code> - </p> - - <p>Access to specific branches is possible via the standard branch - and checkout commands. See the discussion of branch naming below for - more information.</p> - - <p>On Windows, once the repository is cloned, you should ensure - that line endings are set correctly:</p> - - <code><pre> - -$ cd openssl -$ git config core.autocrlf false -$ git config core.eol lf -$ git checkout . - </pre></code> - - <h3>Git branch names and tagging</h3> - - <p>The <em>master</em> branch, also known as the development branch, - contains the latest bleeding edge code. There are also several - <em>stable</em> branches where stable releases come from. These take - the form <em>OpenSSL_x_y_z-stable</em> so, for example, the 1.1.0 stable - branch is <em>OpenSSL_1_1_0-stable</em>. When an actual release is - made it is tagged in the form <em>OpenSSL_x_y_zp</em> or a beta - <em>OpenSSL_x_y_xp-betan</em>, though you should normally just download - the release tarball. Tags and branches are occasionally used for other - purposes such as testing experimental or unstable code before it is - merged into another branch.</p> - - </div> - <footer> - You are here: <a href="/">Home</a> - : <a href=".">Downloads</a> - : <a href="">Git Repository</a> - <br/><a href="/sitemap.txt">Sitemap</a> - </footer> - </article> - </div> - <!--#include virtual="sidebar.shtml" --> - </div> - </div> - -<!--#include virtual="/inc/footer.shtml" --> -</body> - -</html> diff --git a/source/gitrepo.md b/source/gitrepo.md new file mode 100644 index 0000000..f91afc3 --- /dev/null +++ b/source/gitrepo.md @@ -0,0 +1,44 @@ +--- +breadcrumb: Git Repository +--- +# Git Repository + +The OpenSSL software is developed using a Git repository. Read-only access +to the repository is available at git.openssl.org. We also maintain a +downstream clone on GitHub, at <https://github.com/openssl/openssl> on +GitHub. This repository is updated with every commit and is accessible +through a number of protocols. + +On the OpenSSL repository we only support the *git* protocol. Use the +following command to clone the git repository including all available +branches and tags: + +``` console +$ git clone git://git.openssl.org/openssl.git +``` + +Access to specific branches is possible via the standard branch and +checkout commands. See the discussion of branch naming below for more +information. + +On Windows, once the repository is cloned, you should ensure that line +endings are set correctly: + +``` console +$ cd openssl +$ git config core.autocrlf false +$ git config core.eol lf +$ git checkout . +``` + +## Git branch names and tagging + +The *master* branch, also known as the development branch, contains the +latest bleeding edge code. There are also several *stable* branches +where stable releases come from. These take the form +*OpenSSL\_x\_y\_z-stable* so, for example, the 1.1.0 stable branch is +*OpenSSL\_1\_1\_0-stable*. When an actual release is made it is tagged +in the form *OpenSSL\_x\_y\_zp* or a beta *OpenSSL\_x\_y\_xp-betan*, +though you should normally just download the release tarball. Tags and +branches are occasionally used for other purposes such as testing +experimental or unstable code before it is merged into another branch. diff --git a/source/index.html b/source/index.html deleted file mode 100644 index d2964c6..0000000 --- a/source/index.html +++ /dev/null @@ -1,104 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<!--#include virtual="/inc/head.shtml" --> - -<body> -<!--#include virtual="/inc/banner.shtml" --> - - <div id="main"> - <div id="content"> - <div class="blog-index"> - <article> - <header><h2>Downloads</h2></header> - <div class="entry-content"> - <p>The master sources are maintained in our - <a href="gitrepo.html">git repository</a>, which is - accessible over the network and cloned on GitHub, - at <a - href="https://github.com/openssl/openssl">https://github.com/openssl/openssl</a>. - Bugs and pull patches (issues and pull requests) should be - filed on the GitHub repo. - Please familiarize yourself with the - <a href="license.html">license</a>. - </p> - - <p>The table below lists the latest releases for every branch. - (For an explanation of the numbering, see our - <a href="/policies/releasestrat.html">release strategy</a>.) - All releases can be found at - <a href="old">/source/old</a>. - A list of mirror sites can be found <a href="mirror.html">here</a>. - </p> - - <p><em>Note:</em> The latest stable version is the 3.0 series supported - until 7th September 2026. This is also a Long Term Support (LTS) version. - The previous LTS version (the 1.1.1 series) is also available and is - supported until 11th September 2023. All older versions (including 1.1.0, - 1.0.2, 1.0.0 and 0.9.8) are now out of support and should not be used. - Users of these older versions are encouraged to upgrade to 3.0 as soon - as possible. Extended support for 1.0.2 to gain access to security fixes - for that version is <a href="/support/contracts.html">available</a>.</p> - - <p>OpenSSL 3.0 is the latest major version of OpenSSL. The OpenSSL FIPS - Object Module (FOM) 3.0 is an integrated part of the OpenSSL 3.0 - download. You do not need to download the 3.0 FOM separately. Refer to - the installation instructions inside the download, and use the - "enable-fips" compile time configuration option to build it.</p> - - <p>For an overview of some of the key concepts in OpenSSL 3.0 see the - libcrypto - <a href="https://www.openssl.org/docs/man3.0/man7/crypto.html">manual page</a>. - Information and notes about migrating existing applications to OpenSSL - 3.0 are available in the - <a href="https://www.openssl.org/docs/man3.0/man7/migration_guide.html">OpenSSL 3.0 Migration Guide</a></p> - - <table> - <tr> - <td>KBytes </td> - <td>Date </td> - <td>File </td> - </tr> - <!--#include virtual="index.inc" --> - </table> - <p> </p> - - <p>When building a release for the first time, please make sure - to look at the INSTALL file in the distribution along with any NOTES - file applicable to your platform. If you have problems, look at the FAQ, - which can be found <a href="/docs/faq.html">online</a>. If you - still need more help, then join the - <a href="/community/mailinglists.html">openssl-users</a> email list and - post a question there.</p> - - <p>PGP keys for the signatures are available from the - <a href="https://www.openssl.org/community/otc.html">OTC page</a>. - Current members that sign releases include Richard Levitte, - Matt Caswell, Paul Dale, and Tomas Mraz. </p> - - <p> - Each day we make a snapshot of each development branch. - They can be found at - <a href="https://www.openssl.org/source/snapshot/">https://www.openssl.org/source/snapshot/</a>. - These daily snapshots of the source tree are provided for - convenience only and not even guaranteed to compile. Note that - keeping a git local repository and updating it every 24 hours - is equivalent and will often be faster and more efficient.</p> - - <!--#include virtual="/inc/legalities.shtml" --> - </div> - <footer> - You are here: <a href="/">Home</a> - : <a href=".">Downloads</a> - <br/><a href="/sitemap.txt">Sitemap</a> - </footer> - - </article> - </div> - <!--#include virtual="sidebar.shtml" --> - </div> - </div> - -<!--#include virtual="/inc/footer.shtml" --> -</body> - -</html> diff --git a/source/index.md b/source/index.md new file mode 100644 index 0000000..5ba334c --- /dev/null +++ b/source/index.md @@ -0,0 +1,68 @@ +--- +breadcrumb: Downloads +--- +# Downloads + +The master sources are maintained in our [git repository](gitrepo.html), +which is accessible over the network and cloned on GitHub, at +<https://github.com/openssl/openssl>. Bugs and pull patches (issues and +pull requests) should be filed on the GitHub repo. Please familiarize +yourself with the [license](license.html). + +The table below lists the latest releases for every branch. (For an explanation +of the numbering, see our [release strategy](/policies/releasestrat.html).) +All releases can be found at [/source/old](old). A list of mirror sites can be +found [here](mirror.html). + +*Note:* The latest stable version is the 3.0 series supported until 7th +September 2026. This is also a Long Term Support (LTS) version. The +previous LTS version (the 1.1.1 series) is also available and is +supported until 11th September 2023. All older versions (including +1.1.0, 1.0.2, 1.0.0 and 0.9.8) are now out of support and should not be +used. Users of these older versions are encouraged to upgrade to 3.0 as +soon as possible. Extended support for 1.0.2 to gain access to security +fixes for that version is [available](/support/contracts.html). + +OpenSSL 3.0 is the latest major version of OpenSSL. The OpenSSL FIPS +Object Module (FOM) 3.0 is an integrated part of the OpenSSL 3.0 +download. You do not need to download the 3.0 FOM separately. Refer to +the installation instructions inside the download, and use the +"enable-fips" compile time configuration option to build it. + +For an overview of some of the key concepts in OpenSSL 3.0 see the +libcrypto [manual +page](https://www.openssl.org/docs/man3.0/man7/crypto.html). Information +and notes about migrating existing applications to OpenSSL 3.0 are +available in the [OpenSSL 3.0 Migration +Guide](https://www.openssl.org/docs/man3.0/man7/migration_guide.html) + +<p> +<table> + <tr> + <td>KBytes </td> + <td>Date </td> + <td>File </td> + </tr> + <!--#include virtual="index.inc" --> +</table> +</p> + +When building a release for the first time, please make sure to look at +the INSTALL file in the distribution along with any NOTES file +applicable to your platform. If you have problems, look at the FAQ, +which can be found [online](/docs/faq.html). If you still need more +help, then join the [openssl-users](/community/mailinglists.html) email +list and post a question there. + +PGP keys for the signatures are available from the +[OTC page](https://www.openssl.org/community/otc.html). Current members that +sign releases include Richard Levitte, Matt Caswell, Paul Dale, and Tomas Mraz. + +Each day we make a snapshot of each development branch. They can be +found at <https://www.openssl.org/source/snapshot/>. These daily +snapshots of the source tree are provided for convenience only and not +even guaranteed to compile. Note that keeping a git local repository and +updating it every 24 hours is equivalent and will often be faster and +more efficient. + +<!--#include virtual="/inc/legalities.shtml" --> diff --git a/source/license.html b/source/license.html deleted file mode 100644 index ec6ea5d..0000000 --- a/source/license.html +++ /dev/null @@ -1,53 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<!--#include virtual="/inc/head.shtml" --> - -<body> -<!--#include virtual="/inc/banner.shtml" --> - - <div id="main"> - <div id="content"> - <div class="blog-index"> - <article> - <header><h2>License</h2></header> - <div class="entry-content"> - <p> - OpenSSL is covered by one of two licenses, depending on which - release is involved. In all cases, there is a file named - <code>LICENSE</code> in the top-level of the release. - Copies can also be found here. - </p> - <p> - For the 3.0 release, and later releases derived from that, - <a href="apache-license-2.0.txt">the Apache License v2</a> - applies. - This also applies to the git "master" branch. - </p> - <p> - For any release made before OpenSSL 3.0 (namely - the 1.1.1, 1.1.0, 1.0.2, and all prior releases including - those not currently supported), - <a href="license-openssl-ssleay.txt">the dual OpenSSL and SSLeay - license</a> - applies. - Note that this is also true for any updates to those - releases -- the "letter suffix" -- no matter when they are made. - It also applies to the git branches for all those - releases, and to any public forks that have not rebased to - master (or 3.0). - </p> - </div> - <footer> - You are here: <a href="/">Home</a> - : <a href=".">Downloads</a> - : <a href="">License</a> - <br/><a href="/sitemap.txt">Sitemap</a> - </footer> - </article> - </div> - <!--#include virtual="sidebar.shtml" --> - </div> - </div> - -<!--#include virtual="/inc/footer.shtml" --> -</body> diff --git a/source/license.md b/source/license.md new file mode 100644 index 0000000..ec9a270 --- /dev/null +++ b/source/license.md @@ -0,0 +1,20 @@ +--- +breadcrumb: License +--- +# License + +OpenSSL is covered by one of two licenses, depending on which release is +involved. In all cases, there is a file named `LICENSE` in the top-level +of the release. Copies can also be found here. + +For the 3.0 release, and later releases derived from that, +[the Apache License v2](apache-license-2.0.txt) applies. This also +applies to the git "master" branch. + +For any release made before OpenSSL 3.0 (namely the 1.1.1, 1.1.0, 1.0.2, +and all prior releases including those not currently supported), +[the dual OpenSSL and SSLeay license](license-openssl-ssleay.txt) applies. +Note that this is also true for any updates to those releases -- the +"letter suffix" -- no matter when they are made. It also applies to +the git branches for all those releases, and to any public forks that +have not rebased to master (or 3.0). diff --git a/source/mirror.html b/source/mirror.html deleted file mode 100644 index 96c7386..0000000 --- a/source/mirror.html +++ /dev/null @@ -1,55 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<!--#include virtual="/inc/head.shtml" --> - -<body> -<!--#include virtual="/inc/banner.shtml" --> - - <div id="main"> - <div id="content"> - <div class="blog-index"> - <article> - <header><h2>Mirrors</h2></header> - <div class="entry-content"> - <p>You can download the latest distribution files from the - following FTP areas:</p> - <table> - <tr><td>Locale</td><td>URL</td></tr> - - <tr><td>CZ</td><td><a - href="ftp://ftp.fi.muni.cz/pub/openssl/">ftp://ftp.fi.muni.cz/pub/openssl/</a></td></tr> - <tr><td>DE</td><td><a - href="ftp://ftp.pca.dfn.de/pub/tools/net/openssl/">ftp://ftp.pca.dfn.de/pub/tools/net/openssl/</a></td></tr> - <tr><td>DE</td><td><a - href="http://artfiles.org/openssl.org/">http://artfiles.org/openssl.org/</a></td></tr> - <tr><td>HR</td><td><a - href="ftp://ftp.linux.hr/pub/openssl/">ftp://ftp.linux.hr/pub/openssl/</a></td></tr> - <tr><td>HU</td><td><a - href="ftp://ftp.kfki.hu/pub/packages/security/openssl/">ftp://ftp.kfki.hu/pub/packages/security/openssl/</a></td></tr> - <tr><td>PL</td><td><a - href="ftp://guest.kuria.katowice.pl/pub/openssl/">ftp://guest.kuria.katowice.pl/pub/openssl/</a></td></tr> - <tr><td>PL</td><td><a - href="rsync://ftp.tpnet.pl/pub/security/openssl/">rsync://ftp.tpnet.pl/pub/security/openssl/</a></td></tr> - - </table> - - <p> </p> - <p>We are not interested in adding additional mirrors at the - time.</p> - </div> - <footer> - You are here: <a href="/">Home</a> - : <a href=".">Downloads</a> - : <a href="">Mirrors</a> - <br/><a href="/sitemap.txt">Sitemap</a> - </footer> - </article> - </div> - <!--#include virtual="sidebar.shtml" --> - </div> - </div> - -<!--#include virtual="/inc/footer.shtml" --> -</body> - -</html> diff --git a/source/mirror.md b/source/mirror.md new file mode 100644 index 0000000..36ce383 --- /dev/null +++ b/source/mirror.md @@ -0,0 +1,23 @@ +--- +breadcrumb: Mirrors +--- +# Mirrors + +You can download the latest distribution files from the following FTP +areas: + +<p> + +| Locale | URL | +|--------|----------------------------------------------------| +| CZ | <ftp://ftp.fi.muni.cz/pub/openssl/> | +| DE | <ftp://ftp.pca.dfn.de/pub/tools/net/openssl/> | +| DE | <http://artfiles.org/openssl.org/> | +| HR | <ftp://ftp.linux.hr/pub/openssl/> | +| HU | <ftp://ftp.kfki.hu/pub/packages/security/openssl/> | +| PL | <ftp://guest.kuria.katowice.pl/pub/openssl/> | +| PL | <rsync://ftp.tpnet.pl/pub/security/openssl/> | + +</p> + +We are not interested in adding additional mirrors at the time. diff --git a/source/sidebar.shtml b/source/sidebar.shtml deleted file mode 100644 index 6862589..0000000 --- a/source/sidebar.shtml +++ /dev/null @@ -1,28 +0,0 @@ -<!-- sidebar.inc --> -<aside class="sidebar"> - <section> - <!-- What I tell you three times is true: --> - <!-- THIS NEEDS FULL PATHS SINCE THE SUBDIRS INCLUDE THIS NAVBAR. --> - <!-- THIS NEEDS FULL PATHS SINCE THE SUBDIRS INCLUDE THIS NAVBAR. --> - <!-- THIS NEEDS FULL PATHS SINCE THE SUBDIRS INCLUDE THIS NAVBAR. --> - <h1><a href="/source">Downloads</a></h1> - <ul> - <li> - <a href="/source/gitrepo.html">Git Repository</a> - </li> - <li> - <a href="/source/license.html">License</a> - </li> - <li> - <a href="/source/OCB-patent-grant-OpenSSL.pdf">OCB License</a> - </li> - <li> - <a href="/source/old">Old Releases</a> - </li> - <li> - <a href="/source/mirror.html">Mirror Sites</a> - </li> - </ul> - </section> -</aside> -<!-- end --> |