Merge branch 'develop'

Copyright

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2010, Juniper Networks Inc.
+ * Copyright (c) 2007-2015, Juniper Networks Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY <copyright holder> ''AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY Juniper Networks, Inc. ''AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY

bin/Makefile.am

@@ -27,3 +27,9 @@ install-data-hook:
 		cp $$rfile $$mdir/ ; \
         done
 	@${CHMOD} a+x ${GT_INSTALL_DIR}/gt
+
+uninstall-hook:
+	@echo "Uninstalling gt ... "
+	@for file in ${GT_INSTALL_FILES} ; do \
+		${RM} -f ${GT_INSTALL_DIR}/$$file ; \
+        done

bin/Zaliases

@@ -1,6 +1,6 @@
 set top_src=`pwd`
 set test=~/work/xmlsoft/libxslt-1.1.24/tests/
-alias Zautoreconf "(cd $top_src ; autoreconf --install)"
+alias Zautoreconf "(cd $top_src ; autoreconf)"
 
 set opts=' \
 --enable-debug \

bin/gt

@@ -26,7 +26,7 @@ function check_in_details () {
         /bin/echo "[Checking $file into branch $branch]"
         /bin/echo -n "Commit message: "
 	read comment
-	if [ "$comment" = "==" -o "$comment" = "ditto" ]; then
+	if [ "$comment" = "==" -o  "$comment" = "=" -o "$comment" = "ditto" ]; then
 	    comment="$last"
         fi
 	if [ "$comment" = "" ]; then

configure.ac

@@ -12,7 +12,7 @@
 #
 
 AC_PREREQ(2.2)
-AC_INIT([libslax], [0.19.0], [[email protected]])
+AC_INIT([libslax], [0.20.0], [[email protected]])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
 
 # Support silent build rules.  Requires at least automake-1.11.
@@ -25,6 +25,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 LIBXML_REQUIRED_VERSION=2.7.7
 LIBXSLT_REQUIRED_VERSION=1.1.26
 LIBCURL_REQUIRED_VERSION=7.21.3
+SQLITE3_REQUIRED_VERSION=3.7.13
 
 AC_PROG_CC
 AM_PROG_AR
@@ -171,6 +172,30 @@ fi
 AM_CONDITIONAL([USE_LIBXSLT_TESTS], [test "$WITH_LIBXSLT_TESTS" != ""])
 AC_SUBST(WITH_LIBXSLT_TESTS)
 
+#
+# Check the availability of sqlite3
+#
+AX_LIB_SQLITE3([$SQLITE3_REQUIRED_VERSION])
+AM_CONDITIONAL([HAVE_SQLITE3], [test VERSION_TO_NUMBER(echo $SQLITE3_VERSION) -ge VERSION_TO_NUMBER(echo $SQLITE3_REQUIRED_VERSION)])
+if test VERSION_TO_NUMBER(echo $SQLITE3_VERSION) -ge VERSION_TO_NUMBER(echo $SQLITE3_REQUIRED_VERSION)
+then
+    HAVE_SQLITE3=yes
+fi
+
+#
+# Check the availability of sqlcipher
+#
+AC_ARG_WITH(sqlcipher, [ --with-sqlcipher[=DIR] Path to SQLCipher])
+if test "$with_sqlcipher" != ""; then
+    if test -f "$with_sqlcipher/sqlite3.h" ; then
+        USE_SQLCIPHER=$with_sqlcipher
+        AC_DEFINE([HAVE_SQLCIPHER], [1], "Have SQLCipher")
+        HAVE_SQLCIPHER=yes
+        SQLCIPHER_CFLAGS="-I$with_sqlcipher"
+    fi
+fi
+AM_CONDITIONAL([HAVE_SQLCIPHER], [test "$USE_SQLCIPHER" != ""])
+
 #
 # ---- start of noise
 #
@@ -487,6 +512,8 @@ AC_CONFIG_FILES([
   extensions/curl/Makefile
   extensions/exslt/Makefile
   extensions/os/Makefile
+  extensions/db/Makefile
+  extensions/db/sqlite/Makefile
   extensions/xutil/Makefile
   slaxproc/Makefile
   tests/Makefile
@@ -530,11 +557,14 @@ AC_MSG_NOTICE([summary of build options:
   libcurl cflags:   ${LIBCURL_CFLAGS}
   libcurl libs:     ${LIBCURL_LIBS}
   bison version:    ${BISON_VERSION}
+  sqlite3 version:  ${SQLITE3_VERSION}
 
   warnings:         ${SLAX_WARNINGS:-no}
   debug:            ${SLAX_DEBUG:-no}
   readline:         ${HAVE_READLINE:-no}
   libedit:          ${HAVE_LIBEDIT:-no}
   printf-like:      ${HAVE_PRINTFLIKE:-no}
   libxslt tests:    ${WITH_LIBXSLT_TESTS:-no}
+  sqlite3:          ${HAVE_SQLITE3:-no}
+  sqlcipher:        ${HAVE_SQLCIPHER:-no}
 ])

doc/Makefile.am

@@ -104,3 +104,10 @@ install-data-hook:
 	@${CHMOD} a+x ${OXTRADOC_INSTALL_DIR}/oxtradoc
 	@${RM} -f ${DESTDIR}${bindir}/oxtradoc
 	@${LN_S} ${prefix}/share/oxtradoc/oxtradoc ${DESTDIR}${bindir}/oxtradoc
+
+uninstall-hook:
+	@echo "Uninstalling oxtradoc ... "
+	@for file in ${OXTRADOC_INSTALL_FILES} ; do \
+		${RM} -f ${OXTRADOC_INSTALL_DIR}/`basename $$file` ; \
+        done
+	${RM} -f ${DESTDIR}${bindir}/oxtradoc

doc/oxtradoc/oxtradoc-nav.js

@@ -166,6 +166,14 @@ jQuery(function ($) {
         setActive(active.next());
     });
 
+    $("p", $right).each(function (idx, elt) {
+        var $elt = $(elt);
+        var val = $elt.get(0);
+        if (val && val.textContent && val.textContent.startsWith("Section Contents")) {
+            $elt.addClass("section-contents");
+        }
+    });
+
 
     function getMedia () {
         var mediaInspector = document.getElementById('media-inspector');

doc/oxtradoc/oxtradoc.css

@@ -194,3 +194,21 @@ pre {
 	color: black;
     }
 }
+
+p.section-contents, p.section-contents + ul {
+    background-color: #f8f8ff;
+    padding: 1em 0px 1em 3em;
+    border: 1px dotted #0000c0;
+}
+
+p.section-contents + ul {
+    margin: 0px 1em 0px 3em;
+    border-top: 0px;
+}
+
+p.section-contents {
+    margin: 3em 1em 0px 3em;
+    font-weight: bold;
+    border-bottom: 0px;
+    padding-bottom: 0px;
+}

doc/oxtradoc/oxtradoc.in

@@ -500,7 +500,7 @@ sub section {
 	print "</front>\n<middle>\n";
     }
 
-    if ($last_sticky_tag eq "section") {
+    if (1 || $last_sticky_tag eq "section") {
 	list_sections();
     }
 
@@ -857,11 +857,11 @@ sub list_sections {
     return if $phase eq "end";
 
     my $i, $x, $len, $ref, $rest, $title;
+    my $output = "", $hit = 0;
 
     return if $depth <= 0;
     return unless $do_digress;
 
-    print "<t>Section Contents:\n  <list style=\"symbols\">\n";
     for ($i = $line_number; $i <= $#lines; $i++) {
 	($hdr, $rest) = ($lines[$i] =~ /^(\*+)\s+(.*)$/);
 	next unless $hdr;
@@ -879,10 +879,16 @@ sub list_sections {
 	    $x =~ tr/-a-z0-9_//cd;
 	    $ref = $x;
 	}
-	$ref .= "-" . $anchors{$ref} if $ref && $anchors{$ref};
+	$ref .= "-" . ($anchors{$ref} + 1) if $ref && $anchors{$ref};
 
-	print "    <t><xref target=\"$ref\"\/></t>\n";
+	$output .= "    <t><xref target=\"$ref\"\/></t>\n";
+	$hit += 1;
     }
+
+    return unless $hit;
+
+    print "<t>Section Contents:\n  <list style=\"symbols\">\n";
+    print $output;
     print "  </list>\n</t>\n";
 }