libgnutls-extra is no more.

24 files changed, 34 insertions, 164 deletions

diff --git a/Makefile.am b/Makefile.am
index a02e9b7ad3..117d21bcb8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-SUBDIRS = gl lib libextra po src doc tests
+SUBDIRS = gl lib extra po src doc tests
 
 if HAVE_GUILE
 SUBDIRS += guile
diff --git a/NEWS b/NEWS
index e452aa3a2d..f7ac31c511 100644
--- a/NEWS
+++ b/NEWS
@@ -4,8 +4,10 @@ See the end for copying conditions.
 
 * Version 3.0.5 (unreleased)
 
-** libgnutls: Corrected bug in gnutls_x509_data2hex. Report and fix by
-Vincent Untz.
+** libgnutls-extra: is no more
+
+** libgnutls: Corrected bug in gnutls_x509_data2hex. Report and fix 
+by Vincent Untz.
 
 ** API and ABI modifications:
 No changes since last version.
diff --git a/README b/README
index 97c5ac1664..9ab23d1780 100644
--- a/README
+++ b/README
@@ -28,10 +28,9 @@ by running './configure --help'.
     make
     sudo make install
 
-The commands above build and install the static archives (libgnutls.a
-and libgnutls-extra.a), the shared object (libgnutls.so  and
-libgnutls-extra.so), and additional binaries such as certtool and
-gnutls-cli.
+The commands above build and install the static archive (libgnutls.a),
+the shared object (libgnutls.so), and additional binaries such as certtool 
+and gnutls-cli.
 
 The library depends on libnettle and p11-kit. Versions
 2.10.3 and prior used libgcrypt as the default cryptographic library.
@@ -93,10 +92,10 @@ Since GnuTLS version 3.0.0, the core library has been released under
 the GNU Lesser General Public License (LGPL) version 3 or later.
 
 The GNU LGPL applies to the main GnuTLS library, while the
-included applications as well as gnutls-extra and gnutls-openssl 
-libraries are under the GNU GPL version 3.  The gnutls library is 
+included applications as well as gnutls-openssl 
+library are under the GNU GPL version 3.  The gnutls library is 
 located in the lib/ directory, while the applications in src/ and
-gnutls-extra and gnutls-openssl library are at libextra/.
+gnutls-openssl library is at extra/.
 
 For any copyright year range specified as YYYY-ZZZZ in this package
 note that the range specifies every single year in that closed interval.
diff --git a/configure.ac b/configure.ac
index 943617a40c..d558994285 100644
--- a/configure.ac
+++ b/configure.ac
@@ -375,12 +375,6 @@ if test "$opt_guile_bindings" = "yes"; then
 fi
 AM_CONDITIONAL(HAVE_GUILE, test "$opt_guile_bindings" = "yes")
 
-
-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LIBGNUTLS_LIBS"
-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
-AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
-AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
-
 LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
 LIBGNUTLS_CFLAGS="-I${includedir}"
 AC_SUBST(LIBGNUTLS_LIBS)
@@ -460,9 +454,8 @@ AC_CONFIG_FILES([
   tests/rsa-md5-collision/Makefile
   tests/sha2/Makefile
   tests/userid/Makefile
-  libextra/Makefile
-  libextra/gnutls-extra.pc
-  libextra/includes/Makefile
+  extra/Makefile
+  extra/includes/Makefile
   lib/Makefile
   lib/gnutls.pc
   lib/includes/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 574bd7ed08..90a2e3a50e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -88,9 +88,9 @@ MAINTAINERCLEANFILES =
 
 # Generated texinfos.
 
-gnutls_TEXINFOS += gnutls-api.texi extra-api.texi \
+gnutls_TEXINFOS += gnutls-api.texi \
 	x509-api.texi pgp-api.texi
-MAINTAINERCLEANFILES += gnutls-api.texi extra-api.texi \
+MAINTAINERCLEANFILES += gnutls-api.texi \
 	x509-api.texi pgp-api.texi
 
 gnutls-api.texi: $(srcdir)/../lib/*.c $(srcdir)/../lib/ext/*.c $(srcdir)/../lib/auth/*.c $(srcdir)/../lib/algorithms/*.c
@@ -126,17 +126,6 @@ pgp-api.texi: $(srcdir)/../lib/openpgp/*.c
 	rm -f $@-tmp
 	mv -f $@-tmp2 $@
 
-extra-api.texi: $(srcdir)/../libextra/gnutls_extra.c
-	echo "" > $@-tmp
-	for i in $^; do \
-		echo -n "Creating documentation for file $$i... " && \
-		$(srcdir)/scripts/gdoc -texinfo $$i >> $@-tmp && \
-		echo "ok"; \
-	done
-	$(srcdir)/scripts/sort2.pl < $@-tmp > $@-tmp2
-	rm -f $@-tmp
-	mv -f $@-tmp2 $@
-
 # Generated texinfos.
 
 gnutls_TEXINFOS += error_codes.texi algorithms.texi alerts.texi  enums.texi
@@ -194,7 +183,7 @@ GUILE_FOR_BUILD =				\
 
 SNARF_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)			\
 	 -I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes	\
-	 -I$(top_srcdir)/libextra/includes				\
+	 -I$(top_srcdir)/extra/includes				\
          -I$(top_srcdir)/guile/src -I$(top_builddir)/guile/src		\
 	 $(GUILE_CFLAGS)
 
diff --git a/doc/cha-internals.texi b/doc/cha-internals.texi
index ddd280830c..2347efd843 100644
--- a/doc/cha-internals.texi
+++ b/doc/cha-internals.texi
@@ -314,8 +314,7 @@ as long as the LGPLv3+ applies.
 The implementation of the function should lie in the @code{ext/@-foobar.c} file.
 
 To make the API available in the shared library you need to add the
-symbol in @code{lib/@-libgnutls.map} or
-@code{libextra/@-libgnutls-@-extra.map} as appropriate, so that the symbol
+symbol in @code{lib/@-libgnutls.map}, so that the symbol
 is exported properly.
 
 When writing GTK-DOC style documentation for your new APIs, don't
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 692ac6b3a0..53eb7bd5f3 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -23,7 +23,7 @@
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes	\
-	-I$(top_srcdir)/libextra/includes \
+	-I$(top_srcdir)/extra/includes \
 	-I$(top_srcdir)/gl
 
 # Gnulib warns and suggests use of fseeko instead of fseek, which is
@@ -34,7 +34,6 @@ AM_CPPFLAGS += -D_GL_NO_LARGE_FILES
 AM_LDFLAGS = -no-install
 LDADD = libexamples.la				\
 	../../lib/libgnutls.la			\
-	../../libextra/libgnutls-extra.la	\
 	../../gl/libgnu.la			\
 	$(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
 
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index a3360a270d..f15121aaf7 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -657,7 +657,7 @@ $(APIMANS) $(SRPMANS):
 
 update-makefile:
 	FUNCS=`$(top_srcdir)/doc/scripts/gdoc -listfunc \
-		$(top_srcdir)/{lib,libextra,lib/x509,lib/openpgp}/*.c`; \
+		$(top_srcdir)/{lib,lib/x509,lib/openpgp}/*.c`; \
 	MANS=""; \
 	SRPMANS=""; \
 	for i in $$FUNCS; do \
@@ -687,20 +687,6 @@ doit:
 		echo -n "."; \
 	done; \
 	echo ""; \
-	echo -n "Creating man pages for libextra/" && \
-	for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc $(top_srcdir)/libextra/*.c`; do \
-		$(top_srcdir)/doc/scripts/gdoc -man \
-			-module $(PACKAGE) -sourceversion $(VERSION) \
-			-bugsto $(PACKAGE_BUGREPORT) \
-			-pkg-name "$(PACKAGE_NAME)" \
-			-include "gnutls/extra.h" \
-			-seeinfo $(PACKAGE) -verbatimcopying \
-			-copyright "2008 Free Software Foundation" \
-			-function $$i \
-			$(top_srcdir)/libextra/*.c > $$i.3 && \
-		echo -n "."; \
-	done; \
-	echo ""; \
 	echo -n "Creating man pages for lib/x509/" && \
 	for i in `$(top_srcdir)/doc/scripts/gdoc -listfunc $(top_srcdir)/lib/x509/*.c | grep -v gnutls_pkcs12`; do \
 		$(top_srcdir)/doc/scripts/gdoc -man \
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 5fdb00f140..d8e7bae673 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -22,7 +22,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # gtk-doc will search all .c and .h files beneath these paths
 # for inline comments documenting functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
-DOC_SOURCE_DIR=../../lib ../../libextra
+DOC_SOURCE_DIR=../../lib
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
@@ -52,13 +52,11 @@ FIXXREF_OPTIONS=
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
 HFILE_GLOB=$(top_srcdir)/lib/includes/gnutls/*.h \
 	$(top_builddir)/lib/includes/gnutls/*.h \
-	$(top_srcdir)/libextra/includes/gnutls/*.h
+	$(top_srcdir)/extra/includes/gnutls/*.h
 CFILE_GLOB=$(top_srcdir)/lib/*.c \
 	$(top_srcdir)/lib/x509/*.c \
 	$(top_srcdir)/lib/openpgp/*.c \
-	$(top_srcdir)/libextra/*.c \
-	$(top_srcdir)/lib/minitasn1/*.c \
-	$(top_srcdir)/libextra/*.c
+	$(top_srcdir)/lib/minitasn1/*.c
 
 # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
 # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
diff --git a/libextra/Makefile.am b/extra/Makefile.am
index 31c2a95dba..7893244ddc 100644
--- a/libextra/Makefile.am
+++ b/extra/Makefile.am
@@ -37,24 +37,16 @@ endif
 
 SUBDIRS = includes
 
-# Pkg-config script.
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnutls-extra.pc
-DISTCLEANFILES = $(pkgconfig_DATA)
-
 defexecdir = $(bindir)
 defexec_DATA = 
 
-lib_LTLIBRARIES = libgnutls-extra.la
 
-libgnutls_extra_la_SOURCES = libgnutls-extra.map gnutls_extra.c
+# OpenSSL
 
 libgnutls_openssl_la_LDFLAGS = -no-undefined
 
-# OpenSSL
-
 if ENABLE_OPENSSL
-lib_LTLIBRARIES += libgnutls-openssl.la
+lib_LTLIBRARIES = libgnutls-openssl.la
 
 libgnutls_openssl_la_SOURCES = gnutls_openssl.c openssl_compat.h	\
 	openssl_compat.c
@@ -77,34 +69,4 @@ defexec_DATA += libgnutls-openssl-$(DLL_VERSION).def
 endif
 endif
 
-# OpenPGP
-
-libgnutls_extra_la_LIBADD = $(LIBSOCKET)
-libgnutls_extra_la_LDFLAGS = -no-undefined
-
-if !ENABLE_NETTLE
-libgnutls_extra_la_LIBADD += $(LTLIBGCRYPT)
-endif
-
-# Rest
-
-if HAVE_LD_OUTPUT_DEF
-libgnutls_extra_la_LDFLAGS += \
-	-Wl,--output-def,libgnutls-extra-$(DLL_VERSION).def
-defexec_DATA += libgnutls-extra-$(DLL_VERSION).def
-endif
-
-DISTCLEANFILES += $(defexec_DATA)
-
-libgnutls_extra_la_LDFLAGS += \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
-libgnutls_extra_la_LIBADD += ../gl/libgnu.la \
-	../lib/libgnutls.la
-
-if HAVE_LD_VERSION_SCRIPT
-libgnutls_extra_la_LDFLAGS += \
-	-Wl,--version-script=$(srcdir)/libgnutls-extra.map
-else
-libgnutls_extra_la_LDFLAGS += -export-symbols-regex '^(gnutls_).*'
-endif
+DISTCLEANFILES = $(defexec_DATA)
diff --git a/libextra/gnutls-extra.pc.in b/extra/gnutls-extra.pc.in
index 2eb74ae64f..2eb74ae64f 100644
--- a/libextra/gnutls-extra.pc.in
+++ b/extra/gnutls-extra.pc.in
diff --git a/libextra/gnutls_extra.c b/extra/gnutls_extra.c
index a7a4b8019a..a7a4b8019a 100644
--- a/libextra/gnutls_extra.c
+++ b/extra/gnutls_extra.c
diff --git a/libextra/gnutls_openssl.c b/extra/gnutls_openssl.c
index 14121da9a8..14121da9a8 100644
--- a/libextra/gnutls_openssl.c
+++ b/extra/gnutls_openssl.c
diff --git a/libextra/includes/Makefile.am b/extra/includes/Makefile.am
index 23faf4cbdb..5db221ff30 100644
--- a/libextra/includes/Makefile.am
+++ b/extra/includes/Makefile.am
@@ -21,7 +21,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-nobase_include_HEADERS = gnutls/extra.h
+nobase_include_HEADERS = 
 
 if ENABLE_OPENSSL
 nobase_include_HEADERS += gnutls/openssl.h
diff --git a/libextra/includes/gnutls/openssl.h b/extra/includes/gnutls/openssl.h
index 86ae199b02..86ae199b02 100644
--- a/libextra/includes/gnutls/openssl.h
+++ b/extra/includes/gnutls/openssl.h
diff --git a/libextra/libgnutls-extra.map b/extra/libgnutls-extra.map
index f0c75046fd..f0c75046fd 100644
--- a/libextra/libgnutls-extra.map
+++ b/extra/libgnutls-extra.map
diff --git a/libextra/openssl_compat.c b/extra/openssl_compat.c
index 4ce4bf0a6f..4ce4bf0a6f 100644
--- a/libextra/openssl_compat.c
+++ b/extra/openssl_compat.c
diff --git a/libextra/openssl_compat.h b/extra/openssl_compat.h
index d467ee067e..d467ee067e 100644
--- a/libextra/openssl_compat.h
+++ b/extra/openssl_compat.h
diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am
index bc4780768b..21bf00e188 100644
--- a/guile/src/Makefile.am
+++ b/guile/src/Makefile.am
@@ -37,7 +37,6 @@ lib_LTLIBRARIES = libguile-gnutls-v-1.la libguile-gnutls-extra-v-1.la
 
 # Linking against GnuTLS.
 GNUTLS_CORE_LIBS  = $(top_builddir)/lib/libgnutls.la
-GNUTLS_EXTRA_LIBS = $(top_builddir)/libextra/libgnutls-extra.la
 
 # Linking against Gnulib modules.
 GNULIB_LIBS    = $(top_builddir)/gl/libgnu.la
@@ -55,14 +54,14 @@ libguile_gnutls_extra_v_1_la_SOURCES = extra.c
 libguile_gnutls_extra_v_1_la_CFLAGS =		\
   $(AM_CFLAGS) $(GNULIB_CFLAGS) $(GUILE_CFLAGS)
 libguile_gnutls_extra_v_1_la_LIBADD =		\
-  $(GNUTLS_CORE_LIBS) $(GNUTLS_EXTRA_LIBS)	\
+  $(GNUTLS_CORE_LIBS) \
   $(builddir)/libguile-gnutls-v-1.la		\
   $(GNULIB_LIBS) $(GUILE_LDFLAGS)
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/includes \
 	-I$(top_builddir)/lib/includes	\
-	-I$(top_srcdir)/libextra/includes \
+	-I$(top_srcdir)/extra/includes \
 	-I$(top_builddir) \
 	-I$(builddir)
 
diff --git a/libextra/includes/gnutls/extra.h b/libextra/includes/gnutls/extra.h
deleted file mode 100644
index 44611e2d6d..0000000000
--- a/libextra/includes/gnutls/extra.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2002-2011 Free Software Foundation, Inc.
- *
- * Author: Nikos Mavrogiannopoulos
- *
- * This file is part of GnuTLS-EXTRA.
- *
- * GnuTLS-extra is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * GnuTLS-extra 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GnuTLS-EXTRA; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- */
-
-/* Note the libgnutls-extra is not a standalone library. It requires
- * to link also against libgnutls.
- */
-
-#ifndef GNUTLS_EXTRA_H
-#define GNUTLS_EXTRA_H
-
-#include <gnutls/gnutls.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define GNUTLS_EXTRA_VERSION GNUTLS_VERSION
-
-  int gnutls_global_init_extra (void);
-
-/* returns libgnutls-extra version (call it with a NULL argument) 
- */
-  const char *gnutls_extra_check_version (const char *req_version);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 4e459d0a69..bd7d10df20 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,7 @@ AM_CPPFLAGS = \
 	-I$(srcdir)/../gl			\
 	-I$(builddir)/../lib/includes		\
 	-I$(srcdir)/../lib/includes		\
-	-I$(srcdir)/../libextra/includes	\
+	-I$(srcdir)/../extra/includes	\
 	-I$(srcdir)/cfg
 
 bin_PROGRAMS = gnutls-serv gnutls-cli psktool gnutls-cli-debug
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 08104a70bf..606f5ed738 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -38,8 +38,8 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gl			\
 	-I$(top_srcdir)/lib/includes		\
 	-I$(top_builddir)/lib/includes		\
-	-I$(top_srcdir)/libextra/includes	\
-	-I$(top_builddir)/libextra/includes	\
+	-I$(top_srcdir)/extra/includes	\
+	-I$(top_builddir)/extra/includes	\
 	-I$(top_srcdir)/lib			\
 	-I$(top_srcdir)/doc/examples
 
@@ -69,12 +69,11 @@ ctests = mini-deflate simple gc set_pkcs12_cred certder certuniqueid mpi		\
 
 if ENABLE_OPENSSL
 ctests +=  openssl
-openssl_LDADD = $(LDADD) ../libextra/libgnutls-openssl.la
+openssl_LDADD = $(LDADD) ../extra/libgnutls-openssl.la
 endif
 
 if ENABLE_OPENPGP
 ctests += openpgp-auth openpgp-auth2 openpgp-keyring pgps2kgnu
-openpgp_keyring_LDADD = $(LDADD) ../libextra/libgnutls-extra.la
 endif
 
 if HAVE_FORK
diff --git a/tests/openpgp-keyring.c b/tests/openpgp-keyring.c
index 9095ed8ea1..f3cf1f285a 100644
--- a/tests/openpgp-keyring.c
+++ b/tests/openpgp-keyring.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 
 #include <gnutls/gnutls.h>
-#include <gnutls/extra.h>
 #include <gnutls/openpgp.h>
 
 #include "utils.h"
@@ -202,10 +201,6 @@ doit (void)
   if (debug)
     gnutls_global_set_log_level (2);
 
-  ret = gnutls_global_init_extra ();
-  if (ret < 0)
-    fail ("extra-init %d\n", ret);
-
   ret = gnutls_openpgp_keyring_init (&keyring);
   if (ret < 0)
     fail ("keyring-init %d\n", ret);
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index 6113a70593..8cfd73f8a0 100644
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -26,8 +26,8 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gl			\
 	-I$(top_srcdir)/lib/includes		\
 	-I$(top_builddir)/lib/includes		\
-	-I$(top_srcdir)/libextra/includes	\
-	-I$(top_builddir)/libextra/includes	\
+	-I$(top_srcdir)/extra/includes	\
+	-I$(top_builddir)/extra/includes	\
 	-I$(top_srcdir)/lib			\
 	-I$(top_srcdir)/doc/examples	\
 	-I$(top_srcdir)/tests/suite/ecore/src/include \