[openssl-commits] [web] new-dev update

[Richard Levitte]

The branch new-dev has been updated
  discards  caabf8c252fd21c8bb8d366d68d14c83e94c37da (commit)
       via  cb80695ce90a46785e07baab0cb7b04d468cd6a4 (commit)
       via  c670a7df95a7a412c84ba0b3af432ccb3817bbec (commit)
       via  57e533a64bb709e57ab1b08ec3acfb6947760b4a (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (caabf8c252fd21c8bb8d366d68d14c83e94c37da)
            \
             N -- N -- N (cb80695ce90a46785e07baab0cb7b04d468cd6a4)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.


- Log -----------------------------------------------------------------
commit cb80695ce90a46785e07baab0cb7b04d468cd6a4
Author: Richard Levitte <richard at levitte.org>
Date:   Sat Feb 28 23:13:56 2015 +0100

    Everything we deal with here should be owned by openssl
    
    Time to demand that a caller of 'relupd' be openssl, and to avoid all
    the unnecessary sudo.

commit c670a7df95a7a412c84ba0b3af432ccb3817bbec
Author: Richard Levitte <richard at levitte.org>
Date:   Thu Feb 26 15:11:28 2015 +0100

    On the new development machine, the checkouts directory has moved.
    
    This is really not a biggie as there are symbolic links so /v/openssl still
    works.  Unfortunately, newer pod2html picks this apart and is fiddly with
    the result, so better not involve any symlinks when running it.

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

Summary of changes:
 Makefile        |   15 +++++++++------
 run-pod2html.sh |   27 ++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 17d57cf..e2670e3 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,12 @@ manpages:
 
 # Update release notes (and other items, but relnotes is the use-case)
 relupd:
-	id | grep -q root || { echo you must sudo ; exit 1; }
-	( cd $(SNAP)/.. ; for dir in openssl* ; do \
-		echo Updating $$dir ; cd $$dir ; sudo -u openssl git pull $(QUIET) ; cd .. ; \
-		done )
-	sudo -u www-data git pull $(QUIET)
-	sudo -u www-data $(MAKE) generated simple
+	if [ "`id -un`" != openssl; then \
+		echo "**** you must do 'sudo -u openssl -H bash'"; \
+		exit 1; \
+	fi
+	cd $(SNAP)/.. ; for dir in openssl* ; do \
+		echo Updating $$dir ; ( cd $$dir ; git pull $(QUIET) ) ; \
+	done
+	git pull $(QUIET)
+	$(MAKE) generated simple
diff --git a/run-pod2html.sh b/run-pod2html.sh
index b0e081e..0f96a4f 100755
--- a/run-pod2html.sh
+++ b/run-pod2html.sh
@@ -3,15 +3,40 @@ SRC=$1
 DEST=docs
 HERE=`/bin/pwd`
 
+# Somewhere between perl version 5.15 and 5.18, pod2html stopped extracting the
+# title from the pod file's NAME section.  When that's the case, we need to do
+# that work ourselves and give pod2html the extracted title with --title.  --title
+# isn't available in earlier perl verions, so we need to test the behaviour to
+# decide how to act.
+#
+extract_title=false
+pod2html_testtext="=cut
+
+=head1 NAME
+
+foo - bar
+
+=head1 SYNOPSIS
+"
+if echo "$pod2html_testtext" | pod2html | grep -q '^<title></title>$'; then
+    extract_title=true
+fi
+#
+# Test done.
+
 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`
+	title_arg=''
+	if $extract_title; then
+	    title_arg="--title=`cat $IN | sed -e '1,/^=head1 NAME/d' -e '/^=/,$d' -e '/^\s*$/d'`"
+	fi
 	cat $IN \
 	| sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' \
-	| pod2html --podroot=$SRC --css=/manpage.css --htmlroot=/docs --podpath=$SUB:apps:crypto:ssl \
+	| pod2html --podroot=$SRC --css=/manpage.css --htmlroot=/docs --podpath=$SUB:apps:crypto:ssl "$title_arg" \
 	| 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