[openssl-commits] [web] OpenSSL Web Pages branch master updated. 33268635160bba24f6bc98448a8162661d1ddb30

root root at openssl.org
Fri Dec 12 04:07:09 UTC 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSSL Web Pages ".

The branch, master has been updated
       via  33268635160bba24f6bc98448a8162661d1ddb30 (commit)
       via  8a11f2314dd5d23dbefaf7f09b1ba07b73caeb87 (commit)
      from  1c90fbd4f1a896ba8ff2020c4b19584ea58e7255 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 33268635160bba24f6bc98448a8162661d1ddb30
Author: Rich Salz <rsalz at openssl.org>
Date:   Thu Dec 11 23:06:29 2014 -0500

    Tweak fips; add "raw list" to manpages

commit 8a11f2314dd5d23dbefaf7f09b1ba07b73caeb87
Author: root <root at openssl.net>
Date:   Thu Dec 11 16:38:38 2014 -0500

    New scripts to generate the manpages.
    
    Only for the website, not general-purpose.

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

Summary of changes:
 .gitignore          |    2 ++
 docs/fips/index.wml |    4 ++--
 docs/index.wml      |   15 +++++++++------
 getnames.pl         |   30 ++++++++++++++++++++++++++++++
 run-pod2html.sh     |   28 +++++++++++++++++-----------
 5 files changed, 60 insertions(+), 19 deletions(-)
 create mode 100644 getnames.pl

diff --git a/.gitignore b/.gitignore
index e6b8277..d6c50ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 *.html
 *.pdf
 *.gz*
+pod2htmd.tmp
+pod2htmi.tmp
 blog
 news/changelog.inc
 news/vulnerabilities.wml
diff --git a/docs/fips/index.wml b/docs/fips/index.wml
index 976af4c..0e8ccd3 100644
--- a/docs/fips/index.wml
+++ b/docs/fips/index.wml
@@ -7,13 +7,13 @@
 
 Here you can find a number of FIPS140 related files including the user
 guide and test vectors.
-<p>
-<rfilelist "*.pdf *.tar.gz *.zip incore*">
 The latest <a href="UserGuide.pdf">User Guide</a> is the best place to start.  For a basic
 introduction and some general background see
 <a href="fipsnotes.html">Important Notes About OpenSSL and FIPS 140-2</a>, also note the
 <a href="fipsvalidation.html">summary and status</a> of the ongoing open source based OpenSSL FIPS Object Module validation.
 <p>
+<rfilelist "*.pdf *.tar.gz *.zip incore*">
+<p>
 Note FIPS module and FIPS validation support is included in some of the
 OpenSSL <a href="../../support/funding/contract.html">support plans</a>.  Assistance
 with private label validation is also available on a
diff --git a/docs/index.wml b/docs/index.wml
index b43a376..770c8e2 100644
--- a/docs/index.wml
+++ b/docs/index.wml
@@ -13,16 +13,19 @@ features which are not present in other releases.
 <p>
 <ul>
 <li><a href="apps/openssl.html" target="_blank"><font id=sfl>openssl(1)</font></a><br>
-    Manual page documenting the <b>openssl</b> command line tool.
-    (Opens in new page or tab).
+    Manual page documenting the <b>openssl</b> command line tool,
+    or the <a href="apps/">full command list</a>.
+    (Opens in new page or tab.)
 <p>
 <li><a href="ssl/ssl.html" target="_blank"><font id=sfl>ssl(3)</font></a><br>
-    Manual page documenting the OpenSSL <b>SSL/TLS</b> library.
-    (Opens in new page or tab).
+    Manual page documenting the OpenSSL <b>SSL/TLS</b> library,
+    or the <a href="ssl/">full list of SSL API's</a>.
+    (Opens in new page or tab.)
 <p>
 <li><a href="crypto/crypto.html" target="_blank"><font id=sfl>crypto(3)</font></a><br>
-    Manual page documenting the OpenSSL <b>Crypto</b> library.
-    (Opens in new page or tab).
+    Manual page documenting the OpenSSL <b>Crypto</b> library,
+    or the <a href="crypto/">full list of crypto API's</a>.
+    (Opens in new page or tab.)
 <p>
 <li><a href="HOWTO/"><font id=sfl>HOWTO</font></a><br>
     HOWTO documents to introduce concepts or explain them in a way that is not possible in the manuals.
diff --git a/getnames.pl b/getnames.pl
new file mode 100644
index 0000000..58ee6d0
--- /dev/null
+++ b/getnames.pl
@@ -0,0 +1,30 @@
+#!/usr/bin/perl
+
+my $func = $ARGV[0];
+$func =~ s/\.pod//;
+$func =~ s at .*/@@;
+
+open(FH, $ARGV[0]) || die "Can't open $ARGV[1], $!";
+$/ = "";			# Eat a paragraph at once.
+while (<FH>) {
+    chop;
+    s/\n/ /gm;
+    if (/^=head1 /) {
+	$name = 0;
+    } elsif ($name) {
+	if (/ - /) {
+	    s/ - .*//;
+	    s/,\s+/,/g;
+	    s/\s+,/,/g;
+	    s/^\s+//g;
+	    s/\s+$//g;
+	    s/\s/_/g;
+	    push @words, split ',';
+	}
+    }
+    if (/^=head1 *NAME *$/) {
+	$name = 1;
+    }
+}
+
+print join("\n", grep { $_ ne $func } @words),"\n";
diff --git a/run-pod2html.sh b/run-pod2html.sh
index c7a2ce5..0afd144 100755
--- a/run-pod2html.sh
+++ b/run-pod2html.sh
@@ -1,14 +1,20 @@
 #! /bin/sh
-x=$1
-rm -rf pod2htm*
-for subdir in apps crypto ssl ; do
-    mkdir -p docs/$subdir
-    for I in $x/$subdir/*.pod ; do
-	OUT=`basename $I .pod`
-	sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' <$I |
-	pod2html > docs/$subdir/$OUT.html \
-	    --podroot=$x "--htmlroot=/docs" \
-	    "--podpath=apps:crypto:ssl"
+SRC=$1
+DEST=docs
+HERE=`/bin/pwd`
+
+for SUB in apps crypto ssl; do
+    DIR=$DEST/$SUB
+    rm -rf $DIR
+    mkdir -p $DIR
+    for IN in $SRC/$SUB/*.pod; do
+	FN=`basename $IN .pod`
+	cat $IN \
+	| sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' \
+	| pod2html --podroot=$SRC --htmlroot=/docs --podpath=$SUB:apps:crypto:ssl \
+	| sed -r 's/<!DOCTYPE.*//g' > $DIR/$FN.html
+	for L in `perl $HERE/getnames.pl $IN` ; do
+	    ln $DIR/$FN.html $DIR/$L.html || echo FAIL $DIR/$FN.html $DIR/$L.html
+	done
     done
 done
-rm -rf pod2htm*


hooks/post-receive
-- 
OpenSSL Web Pages 


More information about the openssl-commits mailing list