[SCM] GNU gnutls branch, master, updated. gnutls_3_1_3-22-gc6aa147

[Nikos Mavrogiannopoulos]

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 "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=c6aa14724579c198a746d62ed60a89127f53c2cf

The branch, master has been updated
       via  c6aa14724579c198a746d62ed60a89127f53c2cf (commit)
       via  c89a14d3f72c282c56e432af89978da5aad950f2 (commit)
      from  c9576d5286a1e0f1f6be50b49779a604df7be49b (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 c6aa14724579c198a746d62ed60a89127f53c2cf
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Oct 29 19:38:34 2012 +0100

    Added documentation on detecting libgnutls-dane.

commit c89a14d3f72c282c56e432af89978da5aad950f2
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Oct 29 19:31:12 2012 +0100

    Added gnutls-dane.pc.

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

Summary of changes:
 .gitignore                                    |    2 ++
 NEWS                                          |    2 ++
 configure.ac                                  |    1 +
 doc/cha-cert-auth.texi                        |   25 +++++++++++++++++++++++--
 doc/invoke-danetool.texi                      |   18 +-----------------
 libdane/Makefile.am                           |    6 +++++-
 lib/gnutls.pc.in => libdane/gnutls-dane.pc.in |   12 ++++++------
 7 files changed, 40 insertions(+), 26 deletions(-)
 copy lib/gnutls.pc.in => libdane/gnutls-dane.pc.in (73%)

diff --git a/.gitignore b/.gitignore
index 743a7f9..fbef9ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,6 +119,7 @@ doc/latex/gnutls.lot
 doc/manpages/Makefile
 doc/manpages/Makefile.in
 doc/manpages/certtool.1
+doc/manpages/danetool.1
 doc/manpages/gnutls-cli-debug.1
 doc/manpages/gnutls-cli.1
 doc/manpages/gnutls-serv.1
@@ -597,6 +598,7 @@ tests/mini-handshake-timeout
 tests/mini-x509-callbacks
 doc/manpages/stamp_mans
 libdane/libgnutls-dane.la
+libdane/gnutls-dane.pc
 doc/latex/dane-api.tex
 src/libcmd-danetool.la
 src/danetool
diff --git a/NEWS b/NEWS
index aa242d8..b7301b3 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ the available revocation data validity.
 
 ** danetool: Corrected bug that prevented loading PEM files.
 
+** libgnutls-dane: Added pkg-config file for the library.
+
 ** API and ABI modifications:
 gnutls_session_get_id2: Added
 GNUTLS_CERT_REVOCATION_DATA_TOO_OLD: Added.
diff --git a/configure.ac b/configure.ac
index 8d337ee..1d23cb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -569,6 +569,7 @@ AC_CONFIG_FILES([
   extra/includes/Makefile
   libdane/Makefile
   libdane/includes/Makefile
+  libdane/gnutls-dane.pc
   gl/Makefile
   gl/tests/Makefile
   guile/Makefile
diff --git a/doc/cha-cert-auth.texi b/doc/cha-cert-auth.texi
index 7e62365..cb395cb 100644
--- a/doc/cha-cert-auth.texi
+++ b/doc/cha-cert-auth.texi
@@ -500,8 +500,29 @@ in addition to the verification by commercial CA 
infrastructure or
 could even replace it where DNSSEC is deployed.
 
 The DANE functionality is provided by the @code{libgnutls-dane} library that 
is shipped
-with GnuTLS and the function prototypes are in @code{gnutls/dane.h}. The
-high level verification functions are shown below.
+with GnuTLS and the function prototypes are in @code{gnutls/dane.h}. 
+
address@hidden Using the DANE library
+Since the DANE library is not included in GnuTLS it requires programs
+to be linked against it. This can be achieved with the following commands.
+
address@hidden
+gcc -o foo foo.c `pkg-config gnutls-dane --cflags --libs`
address@hidden example
+
+When a program uses the GNU autoconf system, then the following
+line or similar can be used to detect the presence of the library.
+
address@hidden
+PKG_CHECK_MODULES([LIBDANE], [gnutls-dane >= 3.0.0])
+
+AC_SUBST([LIBDANE_CFLAGS])
+AC_SUBST([LIBDANE_LIBS])
address@hidden example
+
address@hidden DANE library functionality
+
+The library provides high level verification functions which are shown below.
 
 @showfuncdesc{dane_verify_crt}
 
diff --git a/doc/invoke-danetool.texi b/doc/invoke-danetool.texi
index 667e6a0..636ab98 100644
--- a/doc/invoke-danetool.texi
+++ b/doc/invoke-danetool.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-danetool.texi)
 # 
-# It has been AutoGen-ed  October 13, 2012 at 10:33:54 PM by AutoGen 5.16
+# It has been AutoGen-ed  October 29, 2012 at 07:37:13 PM by AutoGen 5.16
 # From the definitions    ../src/danetool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -51,9 +51,6 @@ USAGE:  danetool [ -<flag> [<val>] | --<name>address@hidden| 
@}<val>] ]...
        --inder                Use DER format for input certificates and 
private keys.
                                 - disabled as --no-inder
        --inraw                This is an alias for 'inder'
-       --outder               Use DER format for output certificates and 
private keys
-                                - disabled as --no-outder
-       --outraw               This is an alias for 'outder'
        --tlsa-rr              Print the DANE RR data on a certificate or 
public key
                                 - requires these options:
                                 host
@@ -122,19 +119,6 @@ certificates), when reading in DER format a single data 
structure is read.
 This is an alias for the inder option,
 @pxref{danetool inder, the inder option documentation}.
 
address@hidden outder}
address@hidden outder option
address@hidden danetool-outder
-
-This is the ``use der format for output certificates and private keys'' option.
-The output will be in DER or RAW format.
address@hidden outraw}
address@hidden outraw option
address@hidden danetool-outraw
-
-This is an alias for the outder option,
address@hidden outder, the outder option documentation}.
-
 @anchor{danetool tlsa-rr}
 @subheading tlsa-rr option
 @cindex danetool-tlsa-rr
diff --git a/libdane/Makefile.am b/libdane/Makefile.am
index 65a5d5f..91d18ad 100644
--- a/libdane/Makefile.am
+++ b/libdane/Makefile.am
@@ -63,4 +63,8 @@ defexec_DATA += libgnutls-dane-$(DLL_VERSION).def
 endif
 endif
 
-DISTCLEANFILES = $(defexec_DATA)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gnutls-dane.pc
+DISTCLEANFILES = $(pkgconfig_DATA)
+
+DISTCLEANFILES += $(defexec_DATA)
diff --git a/lib/gnutls.pc.in b/libdane/gnutls-dane.pc.in
similarity index 73%
copy from lib/gnutls.pc.in
copy to libdane/gnutls-dane.pc.in
index c45f8f3..32a3df4 100644
--- a/lib/gnutls.pc.in
+++ b/libdane/gnutls-dane.pc.in
@@ -7,18 +7,18 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 
-# Author: Simon Josefsson
+# Author: Nikos Mavrogiannopoulos
 
 address@hidden@
 address@hidden@
 address@hidden@
 address@hidden@
 
-Name: GnuTLS
-Description: Transport Security Layer implementation for the GNU system
+Name: GnuTLS-DANE
+Description: DANE security library for the GNU system
 URL: http://www.gnu.org/software/gnutls/
 Version: @VERSION@
-Libs: -L${libdir} -lgnutls
-Libs.private: @LTLIBNETTLE@
address@hidden@
+Libs: -L${libdir} -lgnutls-dane
+Libs.private: @UNBOUND_LIBS@
+Requires.private: gnutls
 Cflags: -I${includedir}


hooks/post-receive
-- 
GNU gnutls