included programs no longer depend on GPL/LGPLv3 elements of gnulib to prevent their...

diff --git a/NEWS b/NEWS
index 6b34512cc246db3c07b5c2fb92de4b65a15068b0..d94bb31053e736814fa2cb4733e56fe00a1082e8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ See the end for copying conditions.
 
 ** libgnutls: Added the PFS priority string option.
 
+** libgnutls: Gnulib included files are strictly LGPLv2.
+
 ** API and ABI modifications:
 No changes since last version.
 

diff --git a/configure.ac b/configure.ac
index 21b76fced900c48b0a4d862968d64ec86e561e2d..e8660370b65318e5ceef8362ca9e77c24f3f0c2c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,7 @@ AC_PROG_LIBTOOL
 
 dnl No fork on MinGW, disable some self-tests until we fix them.
 dnl Check clock_gettime and pthread_mutex_lock in libc (avoid linking to other libs)
-AC_CHECK_FUNCS([fork getrusage getpwuid_r nanosleep daemon getpid clock_gettime pthread_mutex_lock iconv localtime],,)
+AC_CHECK_FUNCS([fork getrusage getpwuid_r nanosleep daemon getpid clock_gettime pthread_mutex_lock iconv localtime vasprintf],,)
 AM_CONDITIONAL(HAVE_FORK, test "$ac_cv_func_fork" != "no")
 
 if test "$ac_cv_func_pthread_mutex_lock" != "yes";then
@@ -568,9 +568,10 @@ AC_ARG_ENABLE(crywrap,
 
  if test "x$enable_crywrap" != "xno" ; then
        PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no])
+       AC_CHECK_FUNCS([argp_usage],[ac_argp=yes],[ac_argp=no])
  fi
 
- if test "x$libidn" != "xno" && test "$ac_cv_func_daemon" != "no";then
+ if test "x$libidn" != "xno" && test "$ac_cv_func_daemon" != "no" && test "$ac_argp" != "no";then
   crywrap=yes
  fi
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 400b3cfd7efa6c528e91273a4f8525ccd6aaab29..451185945f40b54861b6e3b35c7cbc8fa4e99037 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -72,7 +72,7 @@ COBJECTS = gnutls_range.c gnutls_record.c \
        gnutls_global.c gnutls_constate.c gnutls_anon_cred.c            \
        $(srcdir)/pkix_asn1_tab.c                               \
        $(srcdir)/gnutls_asn1_tab.c                             \
-       gnutls_mem.c gnutls_ui.c                                \
+       gnutls_mem.c gnutls_ui.c vasprintf.c vasprintf.h                \
        gnutls_sig.c gnutls_ecc.c gnutls_dh_primes.c gnutls_alert.c     \
        system.c gnutls_str.c gnutls_state.c gnutls_x509.c              \
        gnutls_rsa_export.c gnutls_helper.c gnutls_supplemental.c       \

diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index 25bd0ca2ff3a0a20b235f32c7dff12ceae10155d..2870e466c6dd2b720f66cca25c4e4a208be994d8 100644 (file)
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -26,6 +26,7 @@
 #ifdef STDC_HEADERS
 #include <stdarg.h>
 #endif
+#include "vasprintf.h"
 
 /* I18n of error codes. */
 #include "gettext.h"

diff --git a/lib/gnutls_str.c b/lib/gnutls_str.c
index 41722fc62e42f2f2e4dc680d8cd03f4ef9b49100..fb7451a0d216ecf5e9fa7b31fede4d5b064c8326 100644 (file)
--- a/lib/gnutls_str.c
+++ b/lib/gnutls_str.c
@@ -26,6 +26,7 @@
 #include <gnutls_str.h>
 #include <stdarg.h>
 #include <c-ctype.h>
+#include "vasprintf.h"
 
 /* These function are like strcat, strcpy. They only
  * do bound checking (they shouldn't cause buffer overruns),

diff --git a/lib/vasprintf.c b/lib/vasprintf.c
new file mode 100644 (file)
index 0000000..dcc3061
--- /dev/null
+++ b/lib/vasprintf.c
@@ -0,0 +1,32 @@
+#include <config.h>
+#include <stdio.h>
+#include "vasprintf.h"
+
+#ifndef HAVE_VASPRINTF
+
+#define MAX_BSIZE 1024
+#define NO_MORE_MAX (16*MAX_BSIZE)
+
+int _gnutls_vasprintf(char **strp, const char *fmt, va_list ap)
+{
+char * buf;
+int ret, max;
+
+  max = MAX_BSIZE/2;
+
+  do 
+    {
+      max *= 2;
+
+      buf = malloc(max);
+      if (buf == NULL)
+        return -1;
+  
+      ret = vsnprintf(buf, max, fmt, ap);
+    }
+  while (ret > max && max < NO_MORE_MAX);
+
+  return ret;
+}
+
+#endif

diff --git a/lib/vasprintf.h b/lib/vasprintf.h
new file mode 100644 (file)
index 0000000..6e0090c
--- /dev/null
+++ b/lib/vasprintf.h
@@ -0,0 +1,12 @@
+#ifndef VASPRINTF_H
+# define VASPRINTF_H
+#include <config.h>
+
+#ifndef HAVE_VASPRINTF
+
+int _gnutls_vasprintf(char **strp, const char *fmt, va_list ap);
+#define vasprintf _gnutls_vasprintf
+
+#endif
+
+#endif

diff --git a/lib/xssl.c b/lib/xssl.c
index 0c897d492b3f4fc7245ec18040d5728b75fafb51..ca2f2530be06f709e4f32e0d2e169641fed0906c 100644 (file)
--- a/lib/xssl.c
+++ b/lib/xssl.c
@@ -25,6 +25,7 @@
 #include <gnutls_num.h>
 #include <gnutls/xssl.h>
 #include <auth/cert.h>
+#include "vasprintf.h"
 
 #include <xssl.h>
 

diff --git a/src/certtool.c b/src/certtool.c
index 06ed505351d96a31b33cd254cf16faca5b822aca..2a1a6689a57cf45fabab88b93f622031088e1460 100644 (file)
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -93,7 +93,6 @@ tls_log_func (int level, const char *str)
 int
 main (int argc, char **argv)
 {
-  set_program_name (argv[0]);
   cfg_init ();
   cmd_parser (argc, argv);
 

diff --git a/src/cli-debug.c b/src/cli-debug.c
index f2759bbf8c77ea06e8672f02a7e98757d7ab156a..a32a75519bce7234cd6186276c65fadc0c0c34a1 100644 (file)
--- a/src/cli-debug.c
+++ b/src/cli-debug.c
@@ -176,7 +176,6 @@ main (int argc, char **argv)
   char portname[6];
   struct addrinfo hints, *res, *ptr;
 
-  set_program_name (argv[0]);
   cmd_parser(argc, argv);
 
 #ifndef _WIN32

diff --git a/src/cli.c b/src/cli.c
index 12ca8a8b040dfc9a786fd032c71f8695902a73ef..105b1d8263c195c41c3d72d51e73f6fc3157d0ab 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -855,7 +855,6 @@ main (int argc, char **argv)
   struct sigaction new_action;
 #endif
 
-  set_program_name (argv[0]);
   cmd_parser (argc, argv);
 
   gnutls_global_set_log_function (tls_log_func);

diff --git a/src/crywrap/Makefile.am b/src/crywrap/Makefile.am
index 9f42db3e79b069a69e897b329c94582365a73637..ca412595e9c8c8b4104c1d70f6392c4489f7d941 100644 (file)
--- a/src/crywrap/Makefile.am
+++ b/src/crywrap/Makefile.am
@@ -17,14 +17,15 @@
 
 AM_CFLAGS = $(WARN_CFLAGS) $(LIBIDN_CFLAGS)
 AM_CPPFLAGS = \
-       -I$(srcdir)/../../gl                    \
        -I$(builddir)/../../lib/includes                \
        -I$(srcdir)/../../lib/includes \
        -DSYSCONFDIR=\"${sysconfdir}\" \
        -DCRYWRAP_PATCHLEVEL=\"${CRYWRAP_PATCHLEVEL}\"
 
+#      -I$(srcdir)/../../gl                    
+
 EXTRA_DIST = README
 bin_PROGRAMS = crywrap
 
 crywrap_SOURCES = crywrap.c primes.h crywrap.h
-crywrap_LDADD = ../../lib/libgnutls.la ../../gl/libgnu.la $(LIBIDN_LIBS)
+crywrap_LDADD = ../../lib/libgnutls.la $(LIBIDN_LIBS) #../../gl/libgnu.la 

diff --git a/src/crywrap/crywrap.c b/src/crywrap/crywrap.c
index 8338d073a9c96b44850f836d96d9ad7b8f152954..b0b0799a221b2bb0491929c3bf9dc291c912a7f2 100644 (file)
--- a/src/crywrap/crywrap.c
+++ b/src/crywrap/crywrap.c
@@ -25,9 +25,7 @@
 
 #include <config.h>
 
-#ifdef HAVE_ARGP_H
 #include <argp.h>
-#endif
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -51,11 +49,6 @@
 #include <stdarg.h>
 #include <unistd.h>
 
-/* Gnulib portability files. */
-#include "progname.h"
-#include "argp.h"
-#include <read-file.h>
-
 #include "crywrap.h"
 #include "primes.h"
 
@@ -201,13 +194,10 @@ static gnutls_datum_t
 load_file (const char *file)
 {
   gnutls_datum_t loaded_file = { NULL, 0 };
-  size_t length;
 
-  loaded_file.data = (void*)read_binary_file (file, &length);
-  if (loaded_file.data)
-    loaded_file.size = (unsigned int) length;
+  gnutls_load_file(file, &loaded_file);
 
-  return loaded_file;
+  return loaded_file;  
 }
 
 /** Generic signal handler.
@@ -1010,7 +1000,6 @@ main (int argc, char **argv, char **envp)
   stringprep_locale_charset ();
 
   config = _crywrap_config_parse (argc, argv);
-  set_program_name(__CRYWRAP__);
 
   _crywrap_tls_init ();
 

diff --git a/src/danetool.c b/src/danetool.c
index fe381f668f31649c8019afab4af60d82a75c2f38..5c2732176f8391f888aeccd9a9513bba8156e4c8 100644 (file)
--- a/src/danetool.c
+++ b/src/danetool.c
@@ -75,7 +75,6 @@ tls_log_func (int level, const char *str)
 int
 main (int argc, char **argv)
 {
-  set_program_name (argv[0]);
   cmd_parser (argc, argv);
 
   return 0;

diff --git a/src/ocsptool.c b/src/ocsptool.c
index 8f9812ca9ec1cbbeffaf641a80cbb54ea8977f6c..ffbb05167282e581bcee519a2bd1efb6bfabec24 100644 (file)
--- a/src/ocsptool.c
+++ b/src/ocsptool.c
@@ -380,8 +380,6 @@ main (int argc, char **argv)
 {
   int ret;
 
-  set_program_name (argv[0]);
-
   if ((ret = gnutls_global_init ()) < 0)
     error (EXIT_FAILURE, 0, "global_init: %s", gnutls_strerror (ret));
 

diff --git a/src/p11tool.c b/src/p11tool.c
index d54a40807db3cc166f17092867e8e57e3c15af8e..924f6bb836286933857b23a45def47e7d83182e8 100644 (file)
--- a/src/p11tool.c
+++ b/src/p11tool.c
@@ -63,7 +63,6 @@ tls_log_func (int level, const char *str)
 int
 main (int argc, char **argv)
 {
-  set_program_name (argv[0]);
   cmd_parser (argc, argv);
 
   return 0;

diff --git a/src/psk.c b/src/psk.c
index 0ef6d4051d097dcd6db8a0d3ac5b4743ed80f23a..beb872c3f3915b2a144a5f6fe6f1b85156da9e95 100644 (file)
--- a/src/psk.c
+++ b/src/psk.c
@@ -76,8 +76,6 @@ main (int argc, char **argv)
   const char* passwd, *username;
   size_t hex_key_size = sizeof (hex_key);
 
-  set_program_name (argv[0]);
-
   if ((ret = gnutls_global_init ()) < 0)
     {
       fprintf (stderr, "global_init: %s\n", gnutls_strerror (ret));

diff --git a/src/serv.c b/src/serv.c
index 15bb856d952a08e75b56de9300c8015adc6a9c7d..591ae6486979c55970b49ca1b52e52fd366041f0 100644 (file)
--- a/src/serv.c
+++ b/src/serv.c
@@ -946,7 +946,6 @@ main (int argc, char **argv)
   char name[256];
   int cert_set = 0;
 
-  set_program_name (argv[0]);
   cmd_parser (argc, argv);
 
 #ifndef _WIN32

diff --git a/src/srptool.c b/src/srptool.c
index 76d9692bb70604ddfe729e8f524494e04da54504..49a62cf29606c0bbc2216462bf997994616afe94 100644 (file)
--- a/src/srptool.c
+++ b/src/srptool.c
@@ -424,8 +424,6 @@ int main (int argc, char **argv)
    struct passwd *pwd;
 #endif
 
-  set_program_name (argv[0]);
-
   if ((ret = gnutls_global_init ()) < 0)
     {
       fprintf (stderr, "global_init: %s\n", gnutls_strerror (ret));

diff --git a/src/tpmtool.c b/src/tpmtool.c
index fe48563f2b2532d5d2f44b7833e6a8147925147a..0c81d3418a341d5de0aa6cc8c4fd00966d1d665c 100644 (file)
--- a/src/tpmtool.c
+++ b/src/tpmtool.c
@@ -70,7 +70,6 @@ tls_log_func (int level, const char *str)
 int
 main (int argc, char **argv)
 {
-  set_program_name (argv[0]);
   cmd_parser (argc, argv);
 
   return 0;