X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=Makefile;h=9da824fa4fc9842a79b2eeee0d3daa2661c12e99;hb=2699cd060272b2bb7735f497d986a6179531b6d2;hp=03f1292cd02affbad629564b329554aabcbef4da;hpb=c48eda367ad21b7c1f00d104915632a2f46b86b8;p=openssl-web.git

diff --git a/Makefile b/Makefile
index 03f1292..9da824f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,9 @@ 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/openssl-0.9.8-notes.inc news/openssl-1.0.0-notes.inc \
+	 news/cl101.txt news/cl102.txt \
 	 news/openssl-1.0.1-notes.inc news/openssl-1.0.2-notes.inc \
+	 news/openssl-1.1.0-notes.inc \
 	 news/newsflash.inc \
 	 news/vulnerabilities.inc \
 	 source/.htaccess \
@@ -26,21 +26,12 @@ SRCLISTS = \
 	   source/old/1.0.0/index.inc \
 	   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 \
 
 all: $(SIMPLE) $(SRCLISTS) manmaster
 
-relupd: all
-	if [ "`id -un`" != openssl ]; then \
-	    echo "You must run this as 'openssl'" ; \
-	    echo "     sudo -u openssl -H make"; \
-	    exit 1; \
-	fi
-	cd $(CHECKOUTS) ; for dir in openssl* ; do \
-	    echo Updating $$dir ; ( cd $$dir ; git pull $(QUIET) ) ; \
-	done
-	git pull $(QUIET)
-	$(MAKE) all manpages
+relupd: all manpages
 
 define makemanpages
 	./bin/mk-manpages $(1) $(2) docs
@@ -51,8 +42,6 @@ endef
 manpages: manmaster
 	$(call makemanpages,$(CHECKOUTS)/openssl-1.0.2-stable,1.0.2)
 	$(call makemanpages,$(CHECKOUTS)/openssl-1.0.1-stable,1.0.1)
-	$(call makemanpages,$(CHECKOUTS)/openssl-1.0.0-stable,1.0.0)
-	$(call makemanpages,$(CHECKOUTS)/openssl-0.9.8-stable,0.9.8)
 
 manmaster:
 	$(call makemanpages,$(CHECKOUTS)/openssl,master)
@@ -79,12 +68,6 @@ 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 $? $@
@@ -92,30 +75,24 @@ 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
+news/openssl-1.1.0-notes.html: news/openssl-notes.html.in
 	@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 > $@
+	sed -e 's|@VERSION@|1.1.0|g' < $< > $@
 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/openssl-1.1.0-notes.inc: $(CHECKOUTS)/openssl/NEWS news/openssl-1.1.0-notes.html
+	@rm -f $@
+	./bin/mk-notes 1.1.0 < $(CHECKOUTS)/openssl/NEWS > $@
 
 news/newsflash.inc: news/newsflash.txt
 	sed <$? >$@ \
@@ -156,6 +133,17 @@ source/old/1.0.1/index.inc: $(wildcard source/old/1.0.1/*.gz)
 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/1.1.0/index.inc: $(wildcard source/old/1.1.0/*.gz)
+	@rm -f $@
+	./bin/mk-filelist source/old/1.0.2 '' '*.gz' >$@
 source/old/fips/index.inc: $(wildcard source/old/fips/*.gz)
 	@rm -f $@
 	./bin/mk-filelist source/old/fips '' '*.gz' >$@
+
+# Because these the indexes of old tarballs will inevitably be newer
+# than the tarballs that are moved into their respective directory,
+# we must declare them phony, or they will not be regenerated when
+# they should.
+.PHONY : \
+	 source/old/1.0.1/index.inc source/old/1.0.2/index.inc \
+	 source/old/fips/index.inc