The branch master has been updated
       via  578ef142566c4cff4c0276cb3d38f571a991f8e7 (commit)
      from  b9c013ef1a7a022b6853b40e9331759d596d22e7 (commit)


- Log -----------------------------------------------------------------
commit 578ef142566c4cff4c0276cb3d38f571a991f8e7
Author: Richard Levitte <levi...@openssl.org>
Date:   Tue Feb 13 15:17:00 2018 +0100

    Add 1.1.1 stuff

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

Summary of changes:
 Makefile | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8a41c35..d3295b8 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ SIMPLE = newsflash.inc sitemap.txt \
          news/openssl-1.1.0-notes.inc \
         news/newsflash.inc \
         news/vulnerabilities.inc \
+        news/vulnerabilities-1.1.1.inc \
         news/vulnerabilities-1.1.0.inc \
         news/vulnerabilities-1.0.2.inc \
         news/vulnerabilities-1.0.1.inc \
@@ -60,6 +61,7 @@ define makemanpages
        ./bin/mk-filelist -a docs/man$(2)/ssl '' '*.html' 
>docs/man$(2)/ssl/index.inc
 endef
 manpages: manmaster
+       $(call makemanpages,$(CHECKOUTS)/openssl-1.1.1-stable,1.1.1)
        $(call makemanpages,$(CHECKOUTS)/openssl-1.1.0-stable,1.1.0)
        $(call makemanpages,$(CHECKOUTS)/openssl-1.0.2-stable,1.0.2)
 
@@ -104,18 +106,27 @@ news/cl102.txt: $(CHECKOUTS)/openssl-1.0.2-stable/CHANGES
 news/cl110.txt: $(CHECKOUTS)/openssl-1.1.0-stable/CHANGES
        @rm -f $@
        cp $? $@
+news/cl111.txt: $(CHECKOUTS)/openssl-1.1.1-stable/CHANGES
+       @rm -f $@
+       cp $? $@
 news/openssl-1.0.2-notes.html: news/openssl-notes.html.in
        @rm -f $@
        sed -e 's|@VERSION@|1.0.2|g' < $< > $@
 news/openssl-1.1.0-notes.html: news/openssl-notes.html.in
        @rm -f $@
        sed -e 's|@VERSION@|1.1.0|g' < $< > $@
+news/openssl-1.1.1-notes.html: news/openssl-notes.html.in
+       @rm -f $@
+       sed -e 's|@VERSION@|1.1.1|g' < $< > $@
 news/openssl-1.0.2-notes.inc: $(CHECKOUTS)/openssl-1.0.2-stable/NEWS 
news/openssl-1.0.2-notes.html bin/mk-notes
        @rm -f $@
        ./bin/mk-notes 1.0.2 < $(CHECKOUTS)/openssl-1.0.2-stable/NEWS > $@
 news/openssl-1.1.0-notes.inc: $(CHECKOUTS)/openssl-1.1.0-stable/NEWS 
news/openssl-1.1.0-notes.html bin/mk-notes
        @rm -f $@
        ./bin/mk-notes 1.1.0 < $(CHECKOUTS)/openssl-1.1.0-stable/NEWS > $@
+news/openssl-1.1.1-notes.inc: $(CHECKOUTS)/openssl-1.1.1-stable/NEWS 
news/openssl-1.1.1-notes.html bin/mk-notes
+       @rm -f $@
+       ./bin/mk-notes 1.1.1 < $(CHECKOUTS)/openssl-1.1.1-stable/NEWS > $@
 news/newsflash.inc: news/newsflash.txt
        sed <$? >$@ \
            -e '/^#/d' \
@@ -125,6 +136,9 @@ news/newsflash.inc: news/newsflash.txt
 news/vulnerabilities.inc: bin/mk-cvepage news/vulnerabilities.xml
        @rm -f $@
        ./bin/mk-cvepage -i news/vulnerabilities.xml > $@
+news/vulnerabilities-1.1.1.inc: bin/mk-cvepage news/vulnerabilities.xml
+       @rm -f $@
+       ./bin/mk-cvepage -i news/vulnerabilities.xml -b 1.1.1 > $@
 news/vulnerabilities-1.1.0.inc: bin/mk-cvepage news/vulnerabilities.xml
        @rm -f $@
        ./bin/mk-cvepage -i news/vulnerabilities.xml -b 1.1.0 > $@
@@ -172,6 +186,9 @@ source/old/1.0.2/index.inc: $(wildcard 
source/old/1.0.2/*.gz) bin/mk-filelist
 source/old/1.1.0/index.inc: $(wildcard source/old/1.1.0/*.gz) bin/mk-filelist
        @rm -f $@
        ./bin/mk-filelist source/old/1.1.0 '' '*.gz' >$@
+source/old/1.1.1/index.inc: $(wildcard source/old/1.1.1/*.gz) bin/mk-filelist
+       @rm -f $@
+       ./bin/mk-filelist source/old/1.1.1 '' '*.gz' >$@
 source/old/fips/index.inc: $(wildcard source/old/fips/*.gz) bin/mk-filelist
        @rm -f $@
        ./bin/mk-filelist source/old/fips '' '*.gz' >$@
@@ -182,4 +199,5 @@ source/old/fips/index.inc: $(wildcard source/old/fips/*.gz) 
bin/mk-filelist
 # they should.
 .PHONY : \
         source/old/1.0.1/index.inc source/old/1.0.2/index.inc \
-        source/old/1.1.0/index.inc source/old/fips/index.inc
+        source/old/1.1.0/index.inc source/old/1.1.1/index.inc \
+        source/old/fips/index.inc
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits

Reply via email to