[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-107-gafe0817

[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=afe08175096b8c4770893b7aa6db1b863abf6133

The branch, master has been updated
       via  afe08175096b8c4770893b7aa6db1b863abf6133 (commit)
       via  025e37ee4b73225bc9d9dd3ad5e5b2c759a467f7 (commit)
      from  1a9c3d8c8b691d9ec1691d6f4afddeb669151cd8 (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 afe08175096b8c4770893b7aa6db1b863abf6133
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jun 3 12:53:19 2012 +0200

    Removed duplicate entries and added an explicit local.

commit 025e37ee4b73225bc9d9dd3ad5e5b2c759a467f7
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jun 3 12:52:03 2012 +0200

    No need for version script for CPP programs.

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

Summary of changes:
 lib/Makefile.am     |    3 ---
 lib/libgnutls.map   |    4 ++--
 lib/libgnutlsxx.map |   30 ------------------------------
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 lib/libgnutlsxx.map

diff --git a/lib/Makefile.am b/lib/Makefile.am
index a15abbe..f3289b9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -170,9 +170,6 @@ libgnutlsxx_la_LDFLAGS = -no-undefined \
 
 libgnutlsxx_la_LIBADD = libgnutls.la
 
-if HAVE_LD_VERSION_SCRIPT
-libgnutlsxx_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libgnutlsxx.map
-endif
 endif
 
 pkix_asn1_tab.c: pkix.asn
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 8a9b390..5fa6ee9 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -634,7 +634,6 @@ GNUTLS_2_12
        gnutls_pubkey_import_pkcs11_url;
        gnutls_pubkey_get_verify_algorithm;
        gnutls_pubkey_verify_hash;
-       gnutls_pkcs11_obj_export;
        gnutls_pubkey_import;
        gnutls_x509_crt_set_pubkey;
        gnutls_x509_crq_set_pubkey;
@@ -834,7 +833,6 @@ GNUTLS_PRIVATE {
     # Internal symbols needed by gnutls-cli-debug:
     _gnutls_rsa_pms_set_version;
     _gnutls_record_set_default_version;
-    _gnutls_record_set_default_version;
     # Internal symbols needed by tests/gc:
     _gnutls_hmac_fast;
     _gnutls_pbkdf2_sha1;
@@ -846,4 +844,6 @@ GNUTLS_PRIVATE {
     # Internal symbols needed by tests/pkcs12_s2k:
     _gnutls_pkcs12_string_to_key;
     _gnutls_bin2hex;
+  local:
+    *;
 };
diff --git a/lib/libgnutlsxx.map b/lib/libgnutlsxx.map
deleted file mode 100644
index fceffec..0000000
--- a/lib/libgnutlsxx.map
+++ /dev/null
@@ -1,30 +0,0 @@
-# libgnutlsxx.map -- linker script for libgnutls.              -*- ld-script 
-*-
-# Copyright (C) 2005-2012 Free Software Foundation, Inc.
-#
-# Author: Simon Josefsson
-#
-# This file is part of GnuTLS.
-#
-# The GnuTLS is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 3 of
-# the License, or (at your option) any later version.
-#
-# The GnuTLS is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>
-
-GNUTLS_2_10
-{
-  global:
-    extern "C++" {
-      # Allow all symbols for C++. It has its own way to keep
-      # symbol namespaces.
-
-      *;
-  };
-};


hooks/post-receive
-- 
GNU gnutls