The branch master has been updated via b830206a38fef328b6d7c4a56b8d316a5839db45 (commit) from 9483f83786104d833b54444798269fac45f6fd44 (commit)
- Log ----------------------------------------------------------------- commit b830206a38fef328b6d7c4a56b8d316a5839db45 Author: Richard Levitte <levi...@openssl.org> Date: Thu Aug 25 18:32:45 2016 +0200 Update web for 1.1.0 now being in its own branch ----------------------------------------------------------------------- Summary of changes: Makefile | 10 +++++++--- news/changelog.html | 3 +-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 297e85a..a00fbc0 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,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.0-stable,1.1.0) $(call makemanpages,$(CHECKOUTS)/openssl-1.0.2-stable,1.0.2) $(call makemanpages,$(CHECKOUTS)/openssl-1.0.1-stable,1.0.1) @@ -74,6 +75,9 @@ news/cl101.txt: $(CHECKOUTS)/openssl-1.0.1-stable/CHANGES news/cl102.txt: $(CHECKOUTS)/openssl-1.0.2-stable/CHANGES @rm -f $@ cp $? $@ +news/cl110.txt: $(CHECKOUTS)/openssl-1.1.0-stable/CHANGES + @rm -f $@ + cp $? $@ news/openssl-1.0.1-notes.html: news/openssl-notes.html.in @rm -f $@ @@ -90,9 +94,9 @@ news/openssl-1.0.1-notes.inc: $(CHECKOUTS)/openssl-1.0.1-stable/NEWS news/openss 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/openssl-1.1.0-notes.inc: $(CHECKOUTS)/openssl/NEWS news/openssl-1.1.0-notes.html +news/openssl-1.1.0-notes.inc: $(CHECKOUTS)/openssl-1.1.0-stable/NEWS news/openssl-1.1.0-notes.html @rm -f $@ - ./bin/mk-notes 1.1.0 < $(CHECKOUTS)/openssl/NEWS > $@ + ./bin/mk-notes 1.1.0 < $(CHECKOUTS)/openssl-1.1.0-stable/NEWS > $@ news/newsflash.inc: news/newsflash.txt sed <$? >$@ \ @@ -146,4 +150,4 @@ source/old/fips/index.inc: $(wildcard source/old/fips/*.gz) # they should. .PHONY : \ source/old/1.0.1/index.inc source/old/1.0.2/index.inc \ - source/old/fips/index.inc + source/old/1.1.0/index.inc source/old/fips/index.inc diff --git a/news/changelog.html b/news/changelog.html index b21a738..a19b08d 100644 --- a/news/changelog.html +++ b/news/changelog.html @@ -29,10 +29,9 @@ 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> + <li><a href="cl110.txt">1.1.0</a></li> </ul> <!--#include virtual="changelog.inc" --> </div> _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits