The branch master has been updated via 49266e288ce2698587c44205ac75b85f4d6da7cc (commit) via ac20fc67b72cf661dd2ae574b2e14d459c7a9f3f (commit) via 39a259dbd009b9167d8a1373c7df12e11e839cb7 (commit) from 10ac045c44c14a807dc5c257417e3c4839c5961c (commit)
- Log ----------------------------------------------------------------- commit 49266e288ce2698587c44205ac75b85f4d6da7cc Author: Richard Levitte <levi...@openssl.org> Date: Thu Dec 3 23:03:39 2015 +0100 Add release notes generator commit ac20fc67b72cf661dd2ae574b2e14d459c7a9f3f Author: Richard Levitte <levi...@openssl.org> Date: Thu Dec 3 23:01:32 2015 +0100 Ignore source/.htacces since it's generated commit 39a259dbd009b9167d8a1373c7df12e11e839cb7 Author: Richard Levitte <levi...@openssl.org> Date: Thu Dec 3 22:58:59 2015 +0100 Add dependencies, so make has a chance to determine if there's work to do ----------------------------------------------------------------------- Summary of changes: .gitignore | 3 ++ Makefile | 41 ++++++++++++++++++----- bin/mk-notes | 39 +++++++++++++++++++++ source/license.html => news/openssl-notes.html.in | 25 ++++++++------ 4 files changed, 89 insertions(+), 19 deletions(-) create mode 100755 bin/mk-notes copy source/license.html => news/openssl-notes.html.in (52%) diff --git a/.gitignore b/.gitignore index f99f40b..e37e39d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,9 +15,12 @@ news/changelog.txt news/newsflash.inc news/cl*.txt news/vulnerabilities.inc +news/openssl-*-notes.html +news/openssl-*-notes.inc newsflash.inc source/*.gz* source/*.patch +source/.htaccess source/index.inc source/license.txt source/old/*/*.patch diff --git a/Makefile b/Makefile index 6df8a09..3e10b5e 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,31 @@ news/cl102.txt: $(CHECKOUTS)/openssl-1.0.2-stable/CHANGES @rm -f $@ cp $? $@ +news/openssl-0.9.8-notes.html: news/openssl-notes.html.in + @rm -f $@ + sed -e 's|@VERSION@|0.9.8|g' < $< > $@ +news/openssl-1.0.0-notes.html: news/openssl-notes.html.in + @rm -f $@ + sed -e 's|@VERSION@|1.0.0|g' < $< > $@ +news/openssl-1.0.1-notes.html: news/openssl-notes.html.in + @rm -f $@ + sed -e 's|@VERSION@|1.0.1|g' < $< > $@ +news/openssl-1.0.2-notes.html: news/openssl-notes.html.in + @rm -f $@ + sed -e 's|@VERSION@|1.0.2|g' < $< > $@ +news/openssl-0.9.8-notes.inc: $(CHECKOUTS)/openssl-0.9.8-stable/NEWS news/openssl-0.9.8-notes.html + @rm -f $@ + ./bin/mk-notes 0.9.8 < $(CHECKOUTS)/openssl-0.9.8-stable/NEWS > $@ +news/openssl-1.0.0-notes.inc: $(CHECKOUTS)/openssl-1.0.0-stable/NEWS news/openssl-1.0.0-notes.html + @rm -f $@ + ./bin/mk-notes 1.0.0 < $(CHECKOUTS)/openssl-1.0.0-stable/NEWS > $@ +news/openssl-1.0.1-notes.inc: $(CHECKOUTS)/openssl-1.0.1-stable/NEWS news/openssl-1.0.1-notes.html + @rm -f $@ + ./bin/mk-notes 1.0.1 < $(CHECKOUTS)/openssl-1.0.1-stable/NEWS > $@ +news/openssl-1.0.2-notes.inc: $(CHECKOUTS)/openssl-1.0.2-stable/NEWS news/openssl-1.0.2-notes.html + @rm -f $@ + ./bin/mk-notes 1.0.2 < $(CHECKOUTS)/openssl-1.0.2-stable/NEWS > $@ + news/newsflash.inc: news/newsflash.txt sed <$? >$@ \ -e '/^#/d' \ @@ -103,32 +128,32 @@ news/vulnerabilities.inc: bin/vulnerabilities.xsl news/vulnerabilities.xml docs/faq.inc: docs/faq.txt @rm -f $@ ./bin/mk-faq <$? >$@ -docs/fips.inc: +docs/fips.inc: $(wildcard docs/fips/*) @rm -f $@ ./bin/mk-filelist docs/fips fips/ '*' >$@ -source/.htaccess: +source/.htaccess: $(wildcard source/openssl-*.tar.gz) @rm -f @? ./bin/mk-latest source >$@ source/license.txt: $(SNAP)/LICENSE @rm -f $@ cp $? $@ -source/index.inc: +source/index.inc: $(wildcard $(RELEASEDIR)/openssl-*.tar.gz) @rm -f $@ ./bin/mk-filelist -a $(RELEASEDIR) '' 'openssl-*.tar.gz' >$@ -source/old/0.9.x/index.inc: +source/old/0.9.x/index.inc: $(wildcard source/old/0.9.x/*.gz) @rm -f $@ ./bin/mk-filelist source/old/0.9.x '' '*.gz' >$@ -source/old/1.0.0/index.inc: +source/old/1.0.0/index.inc: $(wildcard source/old/1.0.0/*.gz) @rm -f $@ ./bin/mk-filelist source/old/1.0.0 '' '*.gz' >$@ -source/old/1.0.1/index.inc: +source/old/1.0.1/index.inc: $(wildcard source/old/1.0.1/*.gz) @rm -f $@ ./bin/mk-filelist source/old/1.0.1 '' '*.gz' >$@ -source/old/1.0.2/index.inc: +source/old/1.0.2/index.inc: $(wildcard source/old/1.0.2/*.gz) @rm -f $@ ./bin/mk-filelist source/old/1.0.2 '' '*.gz' >$@ -source/old/fips/index.inc: +source/old/fips/index.inc: $(wildcard source/old/fips/*.gz) @rm -f $@ ./bin/mk-filelist source/old/fips '' '*.gz' >$@ diff --git a/bin/mk-notes b/bin/mk-notes new file mode 100755 index 0000000..7738c6b --- /dev/null +++ b/bin/mk-notes @@ -0,0 +1,39 @@ +#! /usr/bin/perl -w +use strict; + +my $SERIES = shift @ARGV; +die "Missing series argument" if (! $SERIES); + +my $copy = 0; +my $in_ul = 0; +while ( <STDIN> ) { + chomp; + if (/^\s*(Major changes between|Known issues in).*(\d+\.\d+\.\d+)\D.*\[\d+\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d+\]:?$/) { + if ($in_ul) { + print "</ul>\n"; + $in_ul = 0; + } + if ($2 eq $SERIES) { + print "<h3>"; + print; + print "</h3>\n"; + $copy = 1; + next; + } elsif ($copy) { + last; + } + } + if ($copy) { + # HTML entities. + s|&|&|sg; + s|<|<|sg; + s|>|>|sg; + if (s/^\s+o\s+/<li>/ && !$in_ul) { + print "<ul>\n"; + $in_ul = 1; + } + s/CVE-(\d{4}-\d{4})/<a href=vulnerabilities.html#$1>CVE-$1<\/a>/g; + print; + } +} +print "</ul>"; diff --git a/source/license.html b/news/openssl-notes.html.in similarity index 52% copy from source/license.html copy to news/openssl-notes.html.in index a2ce2e4..1376da6 100644 --- a/source/license.html +++ b/news/openssl-notes.html.in @@ -9,23 +9,24 @@ <div id="content"> <div class="blog-index"> <article> - <header><h2>License</h2></header> + <header><h2>OpenSSL @VERSION@ Series Release Notes<h2></header> <div class="entry-content"> <p> - This is a copy of the current LICENSE file from - the main repository. - The plain-text document version of this document is available - here: - <a href="license.txt">license.txt</a> + The major changes and known issues for the @VERSION@ branch + of the OpenSSL toolkit are summarised below. The contents + reflect the current state of the <tt>NEWS</tt> file inside + the git repository. </p> - <pre> - <!--#include virtual="license.txt" --> - </pre> + + <p> + More details can be found in the <a href="changelog.html">ChangeLog</a>. + </p> + + <!--#include virtual="openssl-@vers...@-notes.inc" --> </div> <footer> You are here: <a href="/">Home</a> - : <a href=".">Downloads</a> - : <a href="">License</a> + : <a href=".">News</a> <br/><a href="/sitemap.txt">Sitemap</a> </footer> </article> @@ -36,3 +37,5 @@ <!--#include virtual="/inc/footer.inc" --> </body> + +</html> _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits