[web] master update

Tue Jan 7 13:08:34 UTC 2020

The branch master has been updated
       via  2bc6b462e2a286361336a2c6bbab2c629dc38c6e (commit)
      from  76f3aa014bf5bf3cf533cf9a0b51951dbd64e8a5 (commit)


- Log -----------------------------------------------------------------
commit 2bc6b462e2a286361336a2c6bbab2c629dc38c6e
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Jan 6 16:22:17 2020 +0000

    Update the website to remove a number of 1.0.2 references
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/web/pull/153)

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

Summary of changes:
 Makefile             | 28 ++++------------------------
 bin/mk-manmap        | 27 ---------------------------
 inc/mansidebar.shtml |  1 -
 source/index.html    | 13 +++++--------
 4 files changed, 9 insertions(+), 60 deletions(-)
 delete mode 100755 bin/mk-manmap

diff --git a/Makefile b/Makefile
index 98ddd9f..df2d75e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,14 +17,10 @@ RELEASEDIR = /var/www/openssl/source
 ##
 
 ##  Current series
-SERIES=1.1.1 1.0.2
+SERIES=1.1.1
 ##  Older series.  The second type is for source listings
-OLDSERIES=1.1.0 1.0.1 1.0.0 0.9.8 0.9.7 0.9.6
-OLDSERIES2=1.1.0 1.0.1 1.0.0 0.9.x
-##  Current series with newer and older manpage layout
-##  (when the number of old man layout releases drop to none, this goes away)
-NEWMANSERIES=1.1.1
-OLDMANSERIES=1.0.2
+OLDSERIES=1.1.0 1.0.2 1.0.1 1.0.0 0.9.8 0.9.7 0.9.6
+OLDSERIES2=1.1.0 1.0.2 1.0.1 1.0.0 0.9.x
 
 # All simple generated files.
 SIMPLE = newsflash.inc sitemap.txt \
@@ -113,17 +109,6 @@ manpages-$(2):
 		      < docs/sub-index.html.tt > docs/man$(2)/index.html
 endef
 
-# makeoldmanmap creates a .htaccess for the man-pages of a given OpenSSL
-# release.  This is only needed for OpenSSL releases where the subdirectories
-# of doc/ are apps/, crypto/ and ssl/.  OpenSSL 1.1.1 and later have a
-# different structure and don't need this: man1/, man3/, man5/ and man7/.
-#
-# $(1) = release version
-define makeoldmanmap
-manmap-$(1):
-	./bin/mk-manmap docs/man$(1) > docs/man$(1)/.htaccess
-endef
-
 # Now that we have the generating macros in place, let's use them!
 #
 # Start off with creating the 'manpages-master' target, taking the
@@ -134,13 +119,8 @@ $(eval $(call makemanpages,openssl,master))
 # source from $(CHECKOUTS)/openssl-x.y.z-stable/doc
 $(foreach S,$(SERIES),$(eval $(call makemanpages,openssl-$(S)-stable,$(S))))
 
-# Finally, create 'manmap-x.y.z' for all releases with the old doc/
-# structure.
-$(foreach S,$(OLDMANSERIES),$(eval $(call makeoldmanmap,$(S))))
-
 manmaster: manpages-master
-manpages: $(foreach S,$(NEWMANSERIES),manpages-$(S)) \
-	  $(foreach S,$(OLDMANSERIES),manpages-$(S) manmap-$(S))
+manpages: $(foreach S,$(SERIES),manpages-$(S))
 
 mancross:
 	./bin/mk-mancross master $(SERIES)
diff --git a/bin/mk-manmap b/bin/mk-manmap
deleted file mode 100755
index 7bde661..0000000
--- a/bin/mk-manmap
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-# $1 is the top of the manual page tree to look through
-
-dir=$1
-cd $dir
-
-for m in `find . -name '*.html'`; do
-    origsubdir=`grep -F '<!-- OSSL: original subdir:' $m | cut -f3 -d: | sed -e 's| *-->||' -e 's| ||g'`
-    subdir=`grep -F '<!-- OSSL: subdir:' $m | cut -f3 -d: | sed -e 's| *-->||' -e 's| ||g'`
-    # If no subdir information is present, this is not a rendered manpage,
-    # but something else, like index.html
-    if [ "$origsubdir$subdir" = "" ]; then
-	continue
-    fi
-    manfile=`echo $m | sed -e 's|\./||'`
-    origmanfile=`echo $manfile | sed -e "s|^$subdir|$origsubdir|"`
-    case ${origsubdir}:${subdir} in
-	apps:man1 | crypto:man3 | ssl:man3 ) ;;
-	* ) echo Redirect permanent /$dir/$origmanfile /$dir/$manfile ;;
-    esac
-done
-
-cat <<EOF
-Redirect permanent /$dir/apps /$dir/man1
-Redirect permanent /$dir/crypto /$dir/man3
-Redirect permanent /$dir/ssl /$dir/man3
-EOF
diff --git a/inc/mansidebar.shtml b/inc/mansidebar.shtml
index 5ec8083..b6c4293 100644
--- a/inc/mansidebar.shtml
+++ b/inc/mansidebar.shtml
@@ -5,7 +5,6 @@
     <ul>
       <li><a href="/docs/manmaster">master</a></li>
       <li><a href="/docs/man1.1.1">1.1.1</a></li>
-      <li><a href="/docs/man1.0.2">1.0.2</a></li>
     </ul>
   </section>
 </aside>
diff --git a/source/index.html b/source/index.html
index 122336a..b617cfe 100644
--- a/source/index.html
+++ b/source/index.html
@@ -32,14 +32,11 @@
 
 	    <p><em>Note:</em> The latest stable version is the 1.1.1 series. This is
         also our Long Term Support (LTS) version, supported until 11th September
-        2023. Our previous LTS version (1.0.2 series) will continue to be
-        supported until 31st December 2019 (security fixes only during the last
-        year of support). All users of 1.0.2 are encouraged to upgrade to 1.1.1
-        as soon as possible. Extended support for 1.0.2 to gain access to
-        security fixes beyond 31st December 2019 is
-        <a href="/support/contracts.html">available</a>.
-        The 0.9.8, 1.0.0, 1.0.1 and 1.1.0 versions are now out of support and
-        should not be used.</p>
+        2023. All other versions (including 1.1.0, 1.0.2, 1.0.0 and 0.9.8) are
+        now out of support and should not be used. Users of these older versions
+        are encourage to upgrade to 1.1.1 as soon as possible. Extended support
+        for 1.0.2 to gain access to security fixes for that version is
+        <a href="/support/contracts.html">available</a>.</p>
 
         <p>The OpenSSL FIPS Object Module 2.0 (FOM) is also available for
         download. It is no longer receiving updates. It must be used in
