Convert all news/*.html to .md

Partial fix of openssl#324

Reviewed-by: Paul Dale <[email protected]>
(Merged from openssl#346)

Author: levitte

.gitignore

@@ -14,15 +14,16 @@ docs/faq.inc
 docs/fips.inc
 docs/man*/
 inc/pandoc-template.html5
-news/changelog.html
 news/changelog.inc
 news/changelog.md
+news/changelog.txt
 news/cl*.txt
 news/newsflash.inc
-news/openssl-*-notes.html
+news/openssl-*-notes.md
 news/openssl-*-notes.inc
 news/vulnerabilities*.inc
-news/vulnerabilities*.html
+news/vulnerabilities*.md
+news/*.html
 newsflash.inc
 source/*.gz*
 source/*.patch

Makefile

@@ -62,6 +62,7 @@ FUTURESERIES=
 H_TOP = $(addsuffix .html,$(basename $(shell git ls-files -- *.md)))
 H_COMMUNITY = $(addsuffix .html,\
                 $(basename $(shell git ls-files -- community/*.md)))
+H_NEWS = $(addsuffix .html,$(basename $(shell git ls-files -- news/*.md)))
 H_POLICIES = $(addsuffix .html,\
                $(basename $(shell git ls-files -- policies/general/*.md \
                                                   policies/technical/*.md)))
@@ -74,6 +75,7 @@ SIMPLE = $(H_TOP) \
          news/changelog.html \
 	 $(foreach S,$(SERIES),news/openssl-$(S)-notes.inc) \
 	 $(foreach S,$(SERIES),news/openssl-$(S)-notes.html) \
+	 $(H_NEWS) \
 	 news/newsflash.inc \
 	 news/secadv \
 	 news/vulnerabilities.inc \
@@ -318,7 +320,7 @@ news/changelog.inc: news/changelog.txt bin/post-process-html5 Makefile
 	@rm -f $@
 	(echo 'Table of contents'; sed -e '1,/^OpenSSL Releases$$/d' < $<) \
 		| pandoc -t html5 -f commonmark | ./bin/post-process-html5 >$@
-news/changelog.html: news/changelog.html.tt news/changelog.inc Makefile bin/from-tt
+news/changelog.md: news/changelog.md.tt news/changelog.inc Makefile bin/from-tt
 	@rm -f $@
 	./bin/from-tt 'releases=$(SERIES)' $<
 # Additionally, make news/changelog.html depend on clxy[z].txt, where xy[z]
@@ -362,7 +364,7 @@ $(eval $(call mknews_changelogtxt,cl$(subst .,,$(S)).txt,openssl-$(S)-stable/CHA
 #
 # $(1) = release version, $(2) = NEWS file, relative to CHECKOUTS
 define mknews_noteshtml
-news/openssl-$(1)-notes.html: news/openssl-notes.html.tt bin/from-tt Makefile
+news/openssl-$(1)-notes.md: news/openssl-notes.md.tt bin/from-tt Makefile
 	@rm -f $$@
 	./bin/from-tt -d news -i $$< -o $$@ release='$(1)'
 news/openssl-$(1)-notes.inc: $(CHECKOUTS)/$(2) bin/mk-notes Makefile
@@ -403,7 +405,7 @@ define mknews_vulnerability
 news/vulnerabilities$(1).inc: bin/mk-cvepage news/vulnerabilities.xml Makefile
 	@rm -f $$@
 	./bin/mk-cvepage -i news/vulnerabilities.xml $(2) > $$@
-news/vulnerabilities$(1).html: news/vulnerabilities.html.tt bin/from-tt Makefile
+news/vulnerabilities$(1).md: news/vulnerabilities.md.tt bin/from-tt Makefile
 	@rm -f $$@
 	./bin/from-tt -d news vulnerabilitiesinc='vulnerabilities$(1).inc' < $$< > $$@
 endef
@@ -496,5 +498,6 @@ endef
 $(foreach H, \
   $(H_TOP) \
   $(H_COMMUNITY) \
+  $(H_NEWS) \
   $(H_POLICIES) \
 ,$(eval $(call makehtmldepend,$(H))))

news/changelog.html.tt

@@ -0,0 +1,21 @@
+---
+breadcrumb: Changelog
+---
+# Changelog
+
+When a release is created, that branch is forked off, and its changelog
+is also forked. For example, none of the changes after 0.9.8n appear in
+the other logs, because 1.0.0 was created after that release and before
+0.9.8o. Any changes that are merged across branches, however, should
+have an entry in each branch's changelog.
+
+This is the changelog for the master branch, the one that is currently
+in active development. The plain-text / markdown version of this
+document is available here: [changelog.txt](changelog.txt)
+
+For other branches, the changelogs are distributed with the source, but
+are also available here:
+
+[% FOREACH release IN releases.split('\s+').reverse -%]
+-   [[% release %]](cl[% release.replace('\.', '') %].txt)
+[% END -%]

news/changelog.md.tt

@@ -0,0 +1,12 @@
+---
+breadcrumbs:
+  - |
+    [Home](/) : [News](.)
+sidebar:
+  - |
+    # [News](.)
+
+    -   [Newslog](newslog.html)
+    -   [Vulnerabilities](vulnerabilities.html)
+    -   [Changelog](changelog.html)
+---

news/dirdata.yaml

@@ -0,0 +1,16 @@
+---
+breadcrumb: News
+---
+# News
+
+To get the latest source, see the [Downloads](/source) section. This also
+lists the latest release of each version. For an exhaustive list of all
+releases (and some other announcements), see the [Newslog](newslog.html)
+page.
+
+If you think you have found a security bug, or want to look at all the
+vulnerabilities we have published and fixed, visit the
+[Vulnerabilities](vulnerabilities.html) page.
+
+We have an online copy of our [Changelog](changelog.html). It is also
+part of the distribution.

news/index.html

@@ -0,0 +1,13 @@
+---
+breadcrumb: Newslog
+---
+# Newslog
+
+Here is a terse log of all OpenSSL announcements. They are almost
+release notices.
+
+<p>
+<table class="newsflash" width="90%">
+  <!--#include virtual="newsflash.inc"-->
+</table>
+</p>