[web] master update

[Richard Levitte]

The branch master has been updated
       via  d75862e89e153138b64119bf4f88d5b1013a928f (commit)
      from  86a7e16d191918cf6bc87764d66c166985bec04e (commit)


- Log -----------------------------------------------------------------
commit d75862e89e153138b64119bf4f88d5b1013a928f
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Apr 26 11:01:06 2021 +0200

    Makefile: Add FUTURESERIES, for series that have no final release yet
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/web/pull/233)

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

Summary of changes:
 Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 741be51..1fe5423 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,11 @@ OLDSERIES2=1.1.0 1.0.2 1.0.1 1.0.0 0.9.x
 MANSERIES1=1.1.1
 MANSERIES3=3.0
 
+##  Future series, i.e. a series that hasn't had any final release yet.
+##  We distinguish them to avoid having to produce notes, vulnerability
+##  documents, ...
+FUTURESERIES=3.0
+
 # All simple generated files.
 SIMPLE = newsflash.inc sitemap.txt \
 	 docs/faq.inc docs/fips.inc \
@@ -42,7 +47,7 @@ SIMPLE = newsflash.inc sitemap.txt \
 	 source/.htaccess \
 	 source/index.inc \
 	 source/old/index.html
-SRCLISTS = $(foreach S,$(SERIES) $(OLDSERIES2) fips,source/old/$(S)/index.inc source/old/$(S)/index.html)
+SRCLISTS = $(foreach S,$(FUTURESERIES) $(SERIES) $(OLDSERIES2) fips,source/old/$(S)/index.inc source/old/$(S)/index.html)
 
 
 .SUFFIXES: .md .html
@@ -312,7 +317,7 @@ endef
 # We also create a list specifically for the old FIPS module, carefully
 # crafting an HTML title with an uppercase 'FIPS' while the subdirectory
 # remains named 'fips'
-$(foreach S,fips $(SERIES) $(OLDSERIES2),$(eval $(call mkoldsourceindex,$(S),$(patsubst fips,FIPS,$(S)))))
+$(foreach S,fips $(FUTURESERIES) $(SERIES) $(OLDSERIES2),$(eval $(call mkoldsourceindex,$(S),$(patsubst fips,FIPS,$(S)))))
 
 source/old/index.html: source/old/index.html.tt bin/from-tt
 	@rm -f $@