[openssl-commits] [web] master update

[Rich Salz]

The branch master has been updated
       via  8ec653d5ef29108f36ff608de1d854a3209abdd3 (commit)
      from  cd6d0eb802e635d076a854a915f8acbd0f71d343 (commit)


- Log -----------------------------------------------------------------
commit 8ec653d5ef29108f36ff608de1d854a3209abdd3
Author: Rich Salz <rsalz at akamai.com>
Date:   Tue Feb 7 16:46:56 2017 -0500

    Remove 1.0.1 manpages, etc.

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

Summary of changes:
 Makefile             | 14 ++------------
 bin/mk-manmaster     |  2 +-
 bin/mk-manpages      |  4 ++--
 docs/manpages.html   |  1 -
 inc/mansidebar.shtml |  1 -
 news/changelog.html  |  1 -
 6 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 9c80ba2..3b96aa4 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,8 @@ RELEASEDIR = /var/www/openssl/source
 SIMPLE = newsflash.inc sitemap.txt \
 	 docs/faq.inc docs/fips.inc \
          news/changelog.inc news/changelog.txt \
-         news/cl101.txt news/cl102.txt news/cl110.txt \
-         news/openssl-1.0.1-notes.inc news/openssl-1.0.2-notes.inc \
+         news/cl102.txt news/cl110.txt \
+         news/openssl-1.0.2-notes.inc \
          news/openssl-1.1.0-notes.inc \
 	 news/newsflash.inc \
 	 news/vulnerabilities.inc \
@@ -42,7 +42,6 @@ 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)
 
 manmaster:
 	./bin/mk-manmaster $(CHECKOUTS)/openssl master docs
@@ -73,9 +72,6 @@ news/changelog.inc: news/changelog.txt bin/mk-changelog
 news/changelog.txt: $(SNAP)/CHANGES
 	@rm -f $@
 	cp $? $@
-news/cl101.txt: $(CHECKOUTS)/openssl-1.0.1-stable/CHANGES
-	@rm -f $@
-	cp $? $@
 news/cl102.txt: $(CHECKOUTS)/openssl-1.0.2-stable/CHANGES
 	@rm -f $@
 	cp $? $@
@@ -83,18 +79,12 @@ 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 $@
-	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-1.1.0-notes.html: news/openssl-notes.html.in
 	@rm -f $@
 	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 bin/mk-notes
-	@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 bin/mk-notes
 	@rm -f $@
 	./bin/mk-notes 1.0.2 < $(CHECKOUTS)/openssl-1.0.2-stable/NEWS > $@
diff --git a/bin/mk-manmaster b/bin/mk-manmaster
index 8267639..4055f86 100755
--- a/bin/mk-manmaster
+++ b/bin/mk-manmaster
@@ -296,7 +296,7 @@ structure may look something like the following (where the contents of
 index.html do not come from this tool):
 
  $ ls some/path/to/web
- man0.9.8    man1.0.0    man1.0.1    man1.0.2    manmaster
+ man1.0.2    man1.1.0    manmaster
  $ ls some/path/to/web/man1.0.2
  apps        crypto      index.html  ssl
  $ ls some/path/to/web/man1.0.2/apps
diff --git a/bin/mk-manpages b/bin/mk-manpages
index 8a892b1..f177f3f 100755
--- a/bin/mk-manpages
+++ b/bin/mk-manpages
@@ -27,7 +27,7 @@ use Pod::Usage qw(pod2usage);
 
 __PACKAGE__->run(@ARGV);
 
-sub Releases { return (qw(master 1.1.0 1.0.2 1.0.1)); }
+sub Releases { return (qw(master 1.1.0 1.0.2)); }
 sub Sections { return (qw(apps crypto ssl)); }
 
 sub getRelease {
@@ -316,7 +316,7 @@ structure may look something like the following (where the contents of
 index.html do not come from this tool):
 
  $ ls some/path/to/web
- man0.9.8    man1.0.0    man1.0.1    man1.0.2    manmaster
+ man1.0.2    man1.1.0    manmaster
  $ ls some/path/to/web/man1.0.2
  apps        crypto      index.html  ssl
  $ ls some/path/to/web/man1.0.2/apps
diff --git a/docs/manpages.html b/docs/manpages.html
index dfe2242..82f6e7d 100644
--- a/docs/manpages.html
+++ b/docs/manpages.html
@@ -16,7 +16,6 @@
               <li><a href="manmaster">master</a></li>
               <li><a href="man1.1.0">1.1.0</a></li>
               <li><a href="man1.0.2">1.0.2</a></li>
-              <li><a href="man1.0.1">1.0.1</a></li>
             </ul>
 	  </div>
 	  <footer>
diff --git a/inc/mansidebar.shtml b/inc/mansidebar.shtml
index c03e26a..64fd0e9 100644
--- a/inc/mansidebar.shtml
+++ b/inc/mansidebar.shtml
@@ -6,7 +6,6 @@
       <li><a href="/docs/manmaster">master</a></li>
       <li><a href="/docs/man1.1.0">1.1.0</a></li>
       <li><a href="/docs/man1.0.2">1.0.2</a></li>
-      <li><a href="/docs/man1.0.1">1.0.1</a></li>
     </ul>
   </section>
 </aside>
diff --git a/news/changelog.html b/news/changelog.html
index 643c214..fd2c062 100644
--- a/news/changelog.html
+++ b/news/changelog.html
@@ -29,7 +29,6 @@
             For other branches, the changelogs are distributed with
             the source, but are also available here:
             <ul>
-              <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>