[openssl-commits] [web] master update

[Rich Salz]

The branch master has been updated
       via  3eb55384519ee3290b5182b525ea632be1004890 (commit)
      from  c4cd68f249965cf0578c19e489b486105a1d040b (commit)


- Log -----------------------------------------------------------------
commit 3eb55384519ee3290b5182b525ea632be1004890
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Aug 19 14:28:38 2015 -0400

    making manpages work

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

Summary of changes:
 Makefile           | 20 +++++++++++---------
 bin/mk-latest      |  6 ------
 bin/mk-manpages    |  7 +++++--
 docs/.htaccess     |  6 ++++++
 docs/manpages.html |  7 -------
 5 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 2421530..10cb6d1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,9 @@
 ## Build procedure for www.openssl.org
 
 ##  Checkouts.
-CHECKOUTS = /var/cache/openssl/checkouts/openssl
+CHECKOUTS = /var/cache/openssl/checkouts
 ##  Snapshot directory
-SNAP = $(CHECKOUST)/openssl
+SNAP = $(CHECKOUTS)/openssl
 ## Where releases are found.
 RELEASEDIR = /var/www/openssl/source
 
@@ -25,7 +25,7 @@ SRCLISTS = \
 	   source/old/1.0.2/index.inc \
 	   source/old/fips/index.inc \
 
-all: $(SIMPLE) $(SRCLISTS)
+all: $(SIMPLE) $(SRCLISTS) manmaster
 
 relupd: all
 	if [ "`id -un`" != openssl ]; then \
@@ -39,12 +39,14 @@ relupd: all
 	git pull $(QUIET)
 	$(MAKE) all manpages
 
-manpages:
-	./bin/mk-manpages $(CHECKOUTS)/master master doc
-	#./bin/mk-manpages $(CHECKOUTS)/openssl-1.0.2-stable 1.0.2 doc
-	#./bin/mk-manpages $(CHECKOUTS)/openssl-1.0.1-stable 1.0.1 doc
-	#./bin/mk-manpages $(CHECKOUTS)/openssl-1.0.0-stable 1.0.0 doc
-	#./bin/mk-manpages $(CHECKOUTS)/openssl-0.9.8-stable 0.9.8 doc
+manpages: manmaster
+	./bin/mk-manpages $(CHECKOUTS)/openssl-1.0.2-stable 1.0.2 docs
+	./bin/mk-manpages $(CHECKOUTS)/openssl-1.0.1-stable 1.0.1 docs
+	./bin/mk-manpages $(CHECKOUTS)/openssl-1.0.0-stable 1.0.0 docs
+	./bin/mk-manpages $(CHECKOUTS)/openssl-0.9.8-stable 0.9.8 docs
+
+manmaster:
+	./bin/mk-manpages $(CHECKOUTS)/openssl master docs
 
 # Legacy targets
 hack-source_htaccess: all
diff --git a/bin/mk-latest b/bin/mk-latest
index e7c05b2..14f586f 100755
--- a/bin/mk-latest
+++ b/bin/mk-latest
@@ -43,12 +43,6 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule openssl-(1\.0\.2.*) old/1.0.1/openssl-$1 [L]
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule openssl-(fips.*)  old/fips/openssl-$1 [L]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule apps(.*)  manmaster/apps/$1 [L]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule crypto(.*)  manmaster/crypto/$1 [L]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ssl(.*)  manmaster/ssl/$1 [L]
 
 <Files *.gz.asc>
     RemoveEncoding .gz
diff --git a/bin/mk-manpages b/bin/mk-manpages
index 506ab57..bf3519a 100755
--- a/bin/mk-manpages
+++ b/bin/mk-manpages
@@ -48,7 +48,7 @@ EOFH
     my $sidebar = <<EOS;
 <aside class="sidebar">
   <section>
-    <h1><a href="/docs/manpages.html">All Versions</a></h1>
+    <h1><a href="/docs/manpages.html">Other Versions</a></h1>
     <ul>
 EOS
     foreach my $v ( @releases ) {
@@ -101,6 +101,8 @@ EOFT
 # $pod->index(1);
     $pod->perldoc_url_prefix("https://www.openssl.org/docs/man$release/$section/");
     $pod->perldoc_url_postfix(".html");
+    $pod->man_url_prefix("https://www.openssl.org/docs/man$release/$section/");
+    $pod->man_url_postfix(".html");
     $pod->html_header($header);
     $pod->html_footer($footer);
 # $pod->force_title("TILETITLETITLE");
@@ -166,7 +168,8 @@ foreach my $sect ( @sections  ) {
 	my $basename = $filename;
 	$basename =~ s at .*/@@;
 	$basename =~ s at .pod@@;
-	my $out = &genhtml ($RELEASE, $sect, $filename, "???", $basename);
+	my $title = $basename;
+	my $out = &genhtml($RELEASE, $sect, $filename, $title, $basename);
 	my $outfile = "$WWWDIR/man$RELEASE/$sect/$basename.html";
 	open(my $fh, ">", $outfile) || die "Can't open $outfile, $!";
 	print $fh $out || die "Can't print $outfile, $!";
diff --git a/docs/.htaccess b/docs/.htaccess
index 499430b..03e477b 100644
--- a/docs/.htaccess
+++ b/docs/.htaccess
@@ -2,3 +2,9 @@ RewriteEngine on
 RewriteRule fips/fipsnotes.html /docs/fipsnotes.html [L,R=302,NC]
 RewriteRule fips/fipsvalidation.html /docs/fipsvalidation.html [L,R=302,NC]
 RewriteRule fips/index.html /docs/fips/fips.html [L,R=302,NC]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule apps/(.*)  /docs/manmaster/apps/$1 [L,R=302,NC]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule crypto/(.*)  /docs/manmaster/crypto/$1 [L,R=302,NC]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ssl/(.*)  /docs/manmaster/ssl/$1 [L,R=302,NC]
diff --git a/docs/manpages.html b/docs/manpages.html
index f07f8b7..e7fe326 100644
--- a/docs/manpages.html
+++ b/docs/manpages.html
@@ -9,13 +9,6 @@
 	<article>
 	  <header><h2>Manpages</h2></header>
 	  <div class="entry-content">
-            <p>
-            <strong>
-              <hr>
-              STILL A WORK IN PROGRESS.  NOT FINISHED!
-              <hr>
-            </strong>
-            </p>
 	    <p>
             The manual pages for all releases are available online:
 	    </p>