[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-133-g931db69
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-133-g931db69 |
|
Date: |
Tue, 25 Sep 2012 15:22:50 +0000 |
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=931db698efcf6570df64f97f93f857bb0eae8a10
The branch, master has been updated
via 931db698efcf6570df64f97f93f857bb0eae8a10 (commit)
via 86f0a29835babfef353b05e267f4710abe866919 (commit)
via 8ee791268815e56ad4adebe643b0aefe0b034f1e (commit)
from 3b70d49d37d5c9f2d25fab06891bfa5bdf34211f (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 931db698efcf6570df64f97f93f857bb0eae8a10
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Tue Sep 25 17:22:09 2012 +0200
updated cross.mk
commit 86f0a29835babfef353b05e267f4710abe866919
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Tue Sep 25 17:11:22 2012 +0200
added missing tpm.h header
commit 8ee791268815e56ad4adebe643b0aefe0b034f1e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Tue Sep 25 16:51:44 2012 +0200
All external libraries that were in LDFLAGS are moved into LIBADD/LDADD.
It also fixes order within LIBADD/LDADD so that libtool objects go first.
Patch by Bartosz Brachaczek.
-----------------------------------------------------------------------
Summary of changes:
cross.mk | 8 ++++----
doc/Makefile.am | 12 +++++++++++-
doc/examples/Makefile.am | 4 ++--
extra/Makefile.am | 6 ++++--
lib/Makefile.am | 18 ++++++++++--------
src/Makefile.am | 28 +++++++++++++++-------------
tests/Makefile.am | 2 +-
tests/suite/Makefile.am | 2 +-
8 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/cross.mk b/cross.mk
index 0c569de..6dab590 100644
--- a/cross.mk
+++ b/cross.mk
@@ -1,12 +1,12 @@
-GNUTLS_VERSION:=3.1.1
+GNUTLS_VERSION:=3.1.2
GNUTLS_FILE:=gnutls-$(GNUTLS_VERSION).tar.xz
GNUTLS_DIR:=gnutls-$(GNUTLS_VERSION)
GMP_FILE:=gmp-5.0.5.tar.bz2
GMP_DIR:=gmp-5.0.5
-P11_KIT_FILE:=p11-kit-0.13.tar.gz
-P11_KIT_DIR:=p11-kit-0.13
+P11_KIT_FILE:=p11-kit-0.14.tar.gz
+P11_KIT_DIR:=p11-kit-0.14
NETTLE_FILE:=nettle-2.5.tar.gz
NETTLE_DIR:=nettle-2.5
@@ -119,7 +119,7 @@ $(GNUTLS_DIR)/.configured: $(NETTLE_DIR)/.installed
$(P11_KIT_DIR)/.installed
P11_KIT_LIBS="$(LIB_DIR)/libp11-kit.la" \
LDFLAGS="-L$(LIB_DIR)" CFLAGS="-I$(HEADERS_DIR)"
CXXFLAGS="-I$(HEADERS_DIR)" \
./configure $(CONFIG_FLAGS) --enable-local-libopts
--with-libnettle-prefix=$(LIB_DIR) \
- --disable-openssl-compatibility && cd ..
+ --disable-openssl-compatibility --with-included-libtasn1 && cd
..
touch $@
clean:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7fc802a..549e680 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -201,7 +201,7 @@ HEADER_FILES =
$(top_srcdir)/lib/includes/gnutls/gnutls.h.in \
$(top_srcdir)/lib/includes/gnutls/pkcs12.h
$(top_srcdir)/lib/includes/gnutls/pkcs11.h \
$(top_srcdir)/lib/includes/gnutls/abstract.h
$(top_srcdir)/lib/includes/gnutls/compat.h \
$(top_srcdir)/lib/includes/gnutls/dtls.h
$(top_srcdir)/lib/includes/gnutls/crypto.h \
- $(top_srcdir)/lib/includes/gnutls/ocsp.h
+ $(top_srcdir)/lib/includes/gnutls/ocsp.h
$(top_srcdir)/lib/includes/gnutls/tpm.h
gnutls-api.texi: $(top_srcdir)/lib/includes/gnutls/gnutls.h.in
echo "" > address@hidden
@@ -1554,6 +1554,16 @@ FUNCS += functions/gnutls_tdb_set_store_func
FUNCS += functions/gnutls_tdb_set_store_func.short
FUNCS += functions/gnutls_tdb_set_verify_func
FUNCS += functions/gnutls_tdb_set_verify_func.short
+FUNCS += functions/gnutls_tpm_get_registered
+FUNCS += functions/gnutls_tpm_get_registered.short
+FUNCS += functions/gnutls_tpm_key_list_deinit
+FUNCS += functions/gnutls_tpm_key_list_deinit.short
+FUNCS += functions/gnutls_tpm_key_list_get_url
+FUNCS += functions/gnutls_tpm_key_list_get_url.short
+FUNCS += functions/gnutls_tpm_privkey_delete
+FUNCS += functions/gnutls_tpm_privkey_delete.short
+FUNCS += functions/gnutls_tpm_privkey_generate
+FUNCS += functions/gnutls_tpm_privkey_generate.short
FUNCS += functions/gnutls_transport_get_ptr
FUNCS += functions/gnutls_transport_get_ptr.short
FUNCS += functions/gnutls_transport_get_ptr2
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 29f612f..6f42a1f 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -37,8 +37,8 @@ LDADD = libexamples.la \
../../gl/libgnu.la \
$(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
-CXX_LDADD = $(LDADD) \
- ../../lib/libgnutlsxx.la
+CXX_LDADD = ../../lib/libgnutlsxx.la \
+ $(LDADD)
noinst_PROGRAMS = ex-client-resume ex-client-dtls
noinst_PROGRAMS += ex-cert-select ex-client-x509
diff --git a/extra/Makefile.am b/extra/Makefile.am
index 98421b0..8cbb405 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -53,7 +53,7 @@ lib_LTLIBRARIES = libgnutls-openssl.la
libgnutls_openssl_la_SOURCES = gnutls_openssl.c openssl_compat.h \
openssl_compat.c
-libgnutls_openssl_la_LIBADD = ../gl/libgnu.la $(LIBSOCKET) \
+libgnutls_openssl_la_LIBADD = ../gl/libgnu.la \
../lib/libgnutls.la
libgnutls_openssl_la_LDFLAGS += -version-info
$(LT_SSL_CURRENT):$(LT_SSL_REVISION):$(LT_SSL_AGE)
@@ -61,9 +61,11 @@ libgnutls_openssl_la_LDFLAGS += -version-info
$(LT_SSL_CURRENT):$(LT_SSL_REVISIO
if ENABLE_MINITASN1
libgnutls_openssl_la_LIBADD += ../lib/minitasn1/libminitasn1.la
else
-libgnutls_openssl_la_LDFLAGS += $(LTLIBTASN1)
+libgnutls_openssl_la_LIBADD += $(LTLIBTASN1)
endif
+libgnutls_openssl_la_LIBADD += $(LIBSOCKET)
+
if HAVE_LD_OUTPUT_DEF
libgnutls_openssl_la_LDFLAGS += \
-Wl,--output-def,libgnutls-openssl-$(DLL_VERSION).def
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d0951d4..41adaba 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -118,15 +118,11 @@ libgnutls_la_SOURCES = $(HFILES) $(COBJECTS)
$(SRP_COBJECTS) \
libgnutls_la_LDFLAGS = -no-undefined \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-if WINDOWS
-libgnutls_la_LDFLAGS += -lcrypt32
-endif
-
libgnutls_la_LIBADD = ../gl/libgnu.la x509/libgnutls_x509.la \
accelerated/libaccelerated.la ext/libgnutls_ext.la \
auth/libgnutls_auth.la algorithms/libgnutls_alg.la \
- extras/libgnutls_extras.la \
- $(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL) \
+ extras/libgnutls_extras.la
+thirdparty_libadd = $(LTLIBZ) $(LTLIBINTL) $(LIBSOCKET) $(LTLIBDL) \
$(LTLIBPTHREAD) $(P11_KIT_LIBS) $(LIB_SELECT) $(TSS_LIBS)
if ENABLE_OPENPGP
@@ -143,11 +139,11 @@ endif
if ENABLE_MINITASN1
libgnutls_la_LIBADD += minitasn1/libminitasn1.la
else
-libgnutls_la_LDFLAGS += $(LIBTASN1_LIBS)
+thirdparty_libadd += $(LIBTASN1_LIBS)
endif
if ENABLE_NETTLE
-libgnutls_la_LDFLAGS += $(LTLIBNETTLE)
+thirdparty_libadd += $(LTLIBNETTLE)
libgnutls_la_LIBADD += nettle/libcrypto.la
endif
@@ -159,6 +155,12 @@ defexec_DATA = libgnutls-$(DLL_VERSION).def
DISTCLEANFILES += $(defexec_DATA)
endif
+if WINDOWS
+thirdparty_libadd += -lcrypt32
+endif
+
+libgnutls_la_LIBADD += $(thirdparty_libadd)
+
# C++ library
if ENABLE_CXX
diff --git a/src/Makefile.am b/src/Makefile.am
index 3f16b2e..5a11ebe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,7 +63,8 @@ gnutls_serv_SOURCES = \
common.h common.c \
certtool-common.h
gnutls_serv_LDADD = ../lib/libgnutls.la
-gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la $(LIBOPTS_LDADD)
$(LTLIBINTL)
+gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la
+gnutls_serv_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
gnutls_serv_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB)
noinst_LTLIBRARIES += libcmd-serv.la
libcmd_serv_la_CFLAGS =
@@ -111,8 +112,9 @@ libcmd_cli_la_SOURCES = cli-args.def cli-args.c cli-args.h
gnutls_cli_debug_SOURCES = tls_test.c tests.h tests.c \
socket.c socket.h common.h common.c
gnutls_cli_debug_LDADD = ../lib/libgnutls.la libcmd-cli-debug.la
+gnutls_cli_debug_LDADD += ../gl/libgnu.la
gnutls_cli_debug_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
-gnutls_cli_debug_LDADD += ../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB)
+gnutls_cli_debug_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB)
noinst_LTLIBRARIES += libcmd-cli-debug.la
libcmd_cli_debug_la_CFLAGS =
libcmd_cli_debug_la_SOURCES = cli-debug-args.def cli-debug-args.c
cli-debug-args.h
@@ -127,42 +129,42 @@ noinst_LTLIBRARIES += libcmd-certtool.la
libcmd_certtool_la_CFLAGS =
libcmd_certtool_la_SOURCES = certtool-args.c certtool-args.def certtool-args.h
\
certtool-cfg.h certtool-cfg.c
-libcmd_certtool_la_LIBADD = ../gl/libgnu.la $(LTLIBREADLINE)
+libcmd_certtool_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la
libcmd_certtool_la_LIBADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
-libcmd_certtool_la_LIBADD += ../lib/libgnutls.la
-libcmd_certtool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB)
+libcmd_certtool_la_LIBADD += $(LTLIBREADLINE)
+libcmd_certtool_la_LIBADD += $(INET_PTON_LIB)
# p11 tool
if ENABLE_PKCS11
p11tool_SOURCES = p11tool-args.def p11tool.c pkcs11.c certtool-common.c \
certtool-extras.c p11tool.h common.c
-p11tool_LDADD = ../lib/libgnutls.la $(LIBOPTS_LDADD) $(LTLIBINTL)
+p11tool_LDADD = ../lib/libgnutls.la
p11tool_LDADD += libcmd-p11tool.la ../gl/libgnu.la
+p11tool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
noinst_LTLIBRARIES += libcmd-p11tool.la
libcmd_p11tool_la_CFLAGS =
libcmd_p11tool_la_SOURCES = p11tool-args.def p11tool-args.c p11tool-args.h \
certtool-cfg.h certtool-cfg.c
-libcmd_p11tool_la_LIBADD = ../gl/libgnu.la $(LTLIBREADLINE)
-libcmd_p11tool_la_LIBADD += ../lib/libgnutls.la
-libcmd_p11tool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB)
+libcmd_p11tool_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la
+libcmd_p11tool_la_LIBADD += $(LTLIBREADLINE) $(INET_PTON_LIB)
endif # ENABLE_PKCS11
if ENABLE_TROUSERS
tpmtool_SOURCES = tpmtool-args.def tpmtool.c certtool-common.c
certtool-extras.c common.c
-tpmtool_LDADD = ../lib/libgnutls.la $(LIBOPTS_LDADD) $(LTLIBINTL)
+tpmtool_LDADD = ../lib/libgnutls.la
tpmtool_LDADD += libcmd-tpmtool.la ../gl/libgnu.la
+tpmtool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
noinst_LTLIBRARIES += libcmd-tpmtool.la
libcmd_tpmtool_la_CFLAGS =
libcmd_tpmtool_la_SOURCES = tpmtool-args.def tpmtool-args.c tpmtool-args.h \
certtool-cfg.h certtool-cfg.c
-libcmd_tpmtool_la_LIBADD = ../gl/libgnu.la $(LTLIBREADLINE)
-libcmd_tpmtool_la_LIBADD += ../lib/libgnutls.la
-libcmd_tpmtool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB)
+libcmd_tpmtool_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la
+libcmd_tpmtool_la_LIBADD += $(LTLIBREADLINE) $(INET_PTON_LIB)
endif # ENABLE_TROUSERS
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b118dd4..2e797a9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -78,7 +78,7 @@ endif
if ENABLE_OPENSSL
ctests += openssl
-openssl_LDADD = $(LDADD) ../extra/libgnutls-openssl.la
+openssl_LDADD = ../extra/libgnutls-openssl.la $(LDADD)
endif
if ENABLE_OPENPGP
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index 0ed7437..6004b9c 100644
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -81,7 +81,7 @@ nodist_libecore_la_SOURCES = ecore/src/lib/ecore_anim.c
\
ecore/src/lib/eina_unicode.c ecore/src/lib/eina_ustrbuf.c \
ecore/src/lib/eina_ustringshare.c ecore/src/lib/eina_value.c
-eagain_cli_LDADD = $(LDADD) libecore.la -lrt -lm -ldl -lpthread
+eagain_cli_LDADD = libecore.la -lrt -lm -ldl -lpthread $(LDADD)
nodist_eagain_cli_SOURCES = mini-eagain2.c
noinst_PROGRAMS = eagain-cli
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_3_1_0-133-g931db69,
Nikos Mavrogiannopoulos <=