[openssl-commits] [web] master update

[Rich Salz]

The branch master has been updated
       via  7267b2d4e5ffbaf8e708d37f7c7667363a688604 (commit)
      from  cd8935dc250abcc389ce1228fd73020346022392 (commit)


- Log -----------------------------------------------------------------
commit 7267b2d4e5ffbaf8e708d37f7c7667363a688604
Author: Rich Salz <rsalz at akamai.com>
Date:   Sun Aug 23 22:47:22 2015 -0400

    Add branch changelogs
    
    Only plaintext for non-master tho :)
    And explain how forking/branch affects what's in the changelog.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore          |  1 +
 Makefile            | 14 ++++++++++++++
 news/changelog.html | 21 ++++++++++++++++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 583aaa9..ed3211e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ mk-manpages.pl
 news/changelog.inc
 news/changelog.txt
 news/newsflash.inc
+news/cl*.txt
 news/vulnerabilities.inc
 newsflash.inc
 source/*.gz*
diff --git a/Makefile b/Makefile
index d986f42..6df8a09 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ RELEASEDIR = /var/www/openssl/source
 SIMPLE = newsflash.inc sitemap.txt \
 	 docs/faq.inc docs/fips.inc \
 	 news/changelog.inc news/changelog.txt \
+	 news/cl098.txt news/cl100.txt news/cl101.txt news/cl102.txt \
 	 news/newsflash.inc \
 	 news/vulnerabilities.inc \
 	 source/.htaccess \
@@ -76,6 +77,19 @@ news/changelog.inc: news/changelog.txt bin/mk-changelog
 news/changelog.txt: $(SNAP)/CHANGES
 	@rm -f $@
 	cp $? $@
+news/cl098.txt: $(CHECKOUTS)/openssl-0.9.8-stable/CHANGES
+	@rm -f $@
+	cp $? $@
+news/cl100.txt: $(CHECKOUTS)/openssl-1.0.0-stable/CHANGES
+	@rm -f $@
+	cp $? $@
+news/cl101.txt: $(CHECKOUTS)/openssl-1.0.1-stable/CHANGES
+	@rm -f $@
+	cp $? $@
+news/cl102.txt: $(CHECKOUTS)/openssl-1.0.2-stable/CHANGES
+	@rm -f $@
+	cp $? $@
+
 news/newsflash.inc: news/newsflash.txt
 	sed <$? >$@ \
 	    -e '/^#/d' \
diff --git a/news/changelog.html b/news/changelog.html
index 66abe58..6cdc9fa 100644
--- a/news/changelog.html
+++ b/news/changelog.html
@@ -11,10 +11,29 @@
 	<article>
 	  <header><h2>Changelog</h2></header>
 	  <div class="entry-content">
-	    <p>
+            <p>
+            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.
+            </p>
+            <p>
+            This is the changelog for the master branch, the one that is
+            currenty in active development.
 	    The plain-text version of this document is available
 	    here: <a href="changelog.txt">changelog.txt</a>
+            </p>
 	    </p>
+            For other branches, the changelogs are distributed with
+            the source, but are also available here:
+            <ul>
+              <li><a href="cl098.txt">0.9.8</a></li>
+              <li><a href="cl100.txt">1.0.0</a></li>
+              <li><a href="cl101.txt">1.0.1</a></li>
+              <li><a href="cl102.txt">1.0.2</a></li>
+            </ul>
 	    <!--#include virtual="changelog.inc" -->
 	  </div>
 	  <footer>