[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_2_9_6-7-ge7622a0
|
From: |
Ludovic Courtès |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_2_9_6-7-ge7622a0 |
|
Date: |
Wed, 23 Sep 2009 09:09:15 +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=e7622a04bdddf56fb5bb5f087885557a2ffb281d
The branch, master has been updated
via e7622a04bdddf56fb5bb5f087885557a2ffb281d (commit)
via 1dc068cb9c86df9c305502ae7a4522b1515e8c42 (commit)
via a75e936f4c4f4ca276c7792dc978844aaa719c29 (commit)
via 8b8df86fe589bff5b1f0fc93be53cad9a9c17596 (commit)
from c95ea7f2f9c12db9bb2f56ae6398ac5836e2cdbd (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 e7622a04bdddf56fb5bb5f087885557a2ffb281d
Author: Ludovic Courtès <address@hidden>
Date: Wed Sep 23 11:07:13 2009 +0200
Fix integer/pointer cast warnings in the Guile bindings on x86_64.
* guile/src/core.c (do_fill_port, fill_session_record_port_input,
scm_gnutls_set_session_transport_fd_x): Make sure pointer/integer casts
use integers of the right size.
commit 1dc068cb9c86df9c305502ae7a4522b1515e8c42
Author: Ludovic Courtès <address@hidden>
Date: Wed Sep 23 11:04:06 2009 +0200
Update Guile bindings to the current OpenPGP API.
* guile/src/extra.c (scm_gnutls_openpgp_certificate_id,
scm_gnutls_openpgp_certificate_id_x): Use
the newer `gnutls_openpgp_crt_get_key_id ()'.
commit a75e936f4c4f4ca276c7792dc978844aaa719c29
Author: Ludovic Courtès <address@hidden>
Date: Wed Sep 23 10:44:29 2009 +0200
Turn off auto-compilation when using Guile 1.9+.
* guile/src/Makefile.am (GUILE_FOR_BUILD): Turn off auto-compilation
with Guile 1.9+.
* guile/tests/Makefile.am (TESTS_ENVIRONMENT): Likewise.
* doc/Makefile.am (GUILE_FOR_BUILD): Likewise.
commit 8b8df86fe589bff5b1f0fc93be53cad9a9c17596
Author: Ludovic Courtès <address@hidden>
Date: Wed Sep 23 10:39:21 2009 +0200
Fix inclusion of <config.h> in Guile bindings.
* guile/src/core.c, guile/src/errors.c, guile/src/extra.c,
guile/src/utils.c: Include <config.h> first, as suggested by Simon
Josefsson.
* guile/src/utils.h: Don't include <config.h>.
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.am | 4 +++-
guile/src/Makefile.am | 5 +++--
guile/src/core.c | 15 ++++++++++-----
guile/src/errors.c | 6 +++++-
guile/src/extra.c | 9 ++++++---
guile/src/utils.c | 6 +++++-
guile/src/utils.h | 6 +-----
guile/tests/Makefile.am | 6 ++++--
8 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2dbaaf0..e3a2046 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -187,7 +187,9 @@ EXTRA_DIST += $(guile_texi)
extract-guile-c-doc.scm
if HAVE_GUILE
-GUILE_FOR_BUILD = $(GUILE) -L $(top_srcdir)/guile/modules
+GUILE_FOR_BUILD = \
+ GUILE_AUTO_COMPILE=0 \
+ $(GUILE) -L $(top_srcdir)/guile/modules
SNARF_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes \
diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am
index 7c9dbe0..2721edf 100644
--- a/guile/src/Makefile.am
+++ b/guile/src/Makefile.am
@@ -1,5 +1,5 @@
# GNUTLS -- Guile bindings for GnuTLS.
-# Copyright (C) 2007, 2008 Free Software Foundation
+# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
#
# GNUTLS is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -15,7 +15,8 @@
# License along with GNUTLS; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
-GUILE_FOR_BUILD = $(GUILE) -L $(top_srcdir)/guile/modules
+GUILE_FOR_BUILD = \
+ GUILE_AUTO_COMPILE=0 $(GUILE) -L $(top_srcdir)/guile/modules
noinst_HEADERS = errors.h utils.h
diff --git a/guile/src/core.c b/guile/src/core.c
index b7e60a9..f791ef8 100644
--- a/guile/src/core.c
+++ b/guile/src/core.c
@@ -1,5 +1,5 @@
/* GNUTLS --- Guile bindings for GnuTLS.
- Copyright (C) 2007, 2008 Free Software Foundation
+ Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
GNUTLS is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,12 @@
/* Written by Ludovic Courtès <address@hidden>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <stdio.h>
+#include <stdint.h>
#include <string.h>
#include <gnutls/gnutls.h>
#include <libguile.h>
@@ -783,7 +788,7 @@ do_fill_port (void *data)
else
scm_gnutls_error (result, "fill_session_record_port_input");
- return ((void *) chr);
+ return ((void *) (uintptr_t) chr);
}
/* Fill in the input buffer of PORT. */
@@ -809,11 +814,11 @@ fill_session_record_port_input (SCM port)
if (SCM_GNUTLS_SESSION_TRANSPORT_IS_FD (c_session))
/* SESSION's underlying transport is a raw file descriptor, so we
must leave "Guile mode" to allow the GC to run. */
- chr = (int) scm_without_guile (do_fill_port, &c_args);
+ chr = (intptr_t) scm_without_guile (do_fill_port, &c_args);
else
/* SESSION's underlying transport is a port, so don't leave "Guile
mode". */
- chr = (int) do_fill_port (&c_args);
+ chr = (intptr_t) do_fill_port (&c_args);
}
else
chr = (int) *c_port->read_pos;
@@ -935,7 +940,7 @@ SCM_DEFINE (scm_gnutls_set_session_transport_fd_x,
c_session = scm_to_gnutls_session (session, 1, FUNC_NAME);
c_fd = (int) scm_to_uint (fd);
- gnutls_transport_set_ptr (c_session, (gnutls_transport_ptr_t) c_fd);
+ gnutls_transport_set_ptr (c_session, (gnutls_transport_ptr_t) (intptr_t)
c_fd);
SCM_GNUTLS_SET_SESSION_TRANSPORT_IS_FD (c_session, 1);
diff --git a/guile/src/errors.c b/guile/src/errors.c
index cb03425..9e362b1 100644
--- a/guile/src/errors.c
+++ b/guile/src/errors.c
@@ -1,5 +1,5 @@
/* GNUTLS --- Guile bindings for GnuTLS.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007, 2009 Free Software Foundation, Inc.
GNUTLS is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -17,6 +17,10 @@
/* Written by Ludovic Courtès <address@hidden>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <libguile.h>
#include <gnutls/gnutls.h>
diff --git a/guile/src/extra.c b/guile/src/extra.c
index 2af48e7..f8f4fdb 100644
--- a/guile/src/extra.c
+++ b/guile/src/extra.c
@@ -1,5 +1,5 @@
/* GNUTLS-EXTRA --- Guile bindings for GNUTLS-EXTRA.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007, 2009 Free Software Foundation, Inc.
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
@@ -20,6 +20,9 @@
/* Written by Ludovic Courtès <address@hidden>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include <stdio.h>
#include <gnutls/gnutls.h>
@@ -167,7 +170,7 @@ SCM_DEFINE (scm_gnutls_openpgp_certificate_id,
"openpgp-certificate-id",
if (c_id == NULL)
scm_gnutls_error (GNUTLS_E_MEMORY_ERROR, FUNC_NAME);
- err = gnutls_openpgp_crt_get_id (c_key, c_id);
+ err = gnutls_openpgp_crt_get_key_id (c_key, c_id);
if (EXPECT_FALSE (err))
scm_gnutls_error (err, FUNC_NAME);
@@ -199,7 +202,7 @@ SCM_DEFINE (scm_gnutls_openpgp_certificate_id_x,
"openpgp-certificate-id!",
scm_misc_error (FUNC_NAME, "ID vector too small: ~A", scm_list_1 (id));
}
- err = gnutls_openpgp_crt_get_id (c_key, (unsigned char *) c_id);
+ err = gnutls_openpgp_crt_get_key_id (c_key, (unsigned char *) c_id);
scm_gnutls_release_array (&c_id_handle);
if (EXPECT_FALSE (err))
diff --git a/guile/src/utils.c b/guile/src/utils.c
index f59312d..1bb531a 100644
--- a/guile/src/utils.c
+++ b/guile/src/utils.c
@@ -1,5 +1,5 @@
/* GNUTLS --- Guile bindings for GnuTLS.
- Copyright (C) 2007, 2008 Free Software Foundation
+ Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
GNUTLS is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -17,6 +17,10 @@
/* Written by Ludovic Courtès <address@hidden>. */
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include "utils.h"
#include <gnutls/gnutls.h>
diff --git a/guile/src/utils.h b/guile/src/utils.h
index 17e3655..88984d1 100644
--- a/guile/src/utils.h
+++ b/guile/src/utils.h
@@ -1,5 +1,5 @@
/* GNUTLS --- Guile bindings for GnuTLS.
- Copyright (C) 2007, 2008 Free Software Foundation
+ Copyright (C) 2007, 2008, 2009 Free Software Foundation
GNUTLS is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -20,10 +20,6 @@
/* Common utilities. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#include <libguile.h>
diff --git a/guile/tests/Makefile.am b/guile/tests/Makefile.am
index ce59729..ac93273 100644
--- a/guile/tests/Makefile.am
+++ b/guile/tests/Makefile.am
@@ -1,5 +1,5 @@
# GNUTLS -- Guile bindings for GnuTLS.
-# Copyright (C) 2007, 2008 Free Software Foundation
+# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
#
# GNUTLS is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,9 @@ if ENABLE_SRP
TESTS += srp-base64.scm
endif
-TESTS_ENVIRONMENT = $(top_builddir)/guile/pre-inst-guile -L $(srcdir)
+TESTS_ENVIRONMENT = \
+ GUILE_AUTO_COMPILE=0 \
+ $(top_builddir)/guile/pre-inst-guile -L $(srcdir)
EXTRA_DIST = $(TESTS) openpgp-pub.asc openpgp-sec.asc \
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_2_9_6-7-ge7622a0,
Ludovic Courtès <=