[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-143-gf5ad381
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-143-gf5ad381 |
|
Date: |
Thu, 18 Feb 2010 09:23:08 +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=f5ad38187df68e3f44faed98abedeac689244b50
The branch, master has been updated
via f5ad38187df68e3f44faed98abedeac689244b50 (commit)
via 8036bd7ff72e5063613e24562ad95c7004f8e8b3 (commit)
via 970afbe1f1ac0a9c153c6c75b433f98b285da3f9 (commit)
from 9985aac98be2b0121a681f1690832c6928fdbf00 (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 f5ad38187df68e3f44faed98abedeac689244b50
Author: Simon Josefsson <address@hidden>
Date: Thu Feb 18 10:22:57 2010 +0100
Add.
commit 8036bd7ff72e5063613e24562ad95c7004f8e8b3
Author: Simon Josefsson <address@hidden>
Date: Thu Feb 18 10:22:06 2010 +0100
Update gnulib files.
commit 970afbe1f1ac0a9c153c6c75b433f98b285da3f9
Author: Simon Josefsson <address@hidden>
Date: Thu Feb 18 10:21:00 2010 +0100
Update gnulib files.
-----------------------------------------------------------------------
Summary of changes:
gl/Makefile.am | 27 ++++++++++++++++++-
gl/{tests/test-sys_time.c => gettime.c} | 33 ++++++++++++++++++-----
gl/{tests => }/gettimeofday.c | 0
gl/m4/clock_time.m4 | 31 ++++++++++++++++++++++
gl/m4/gettime.m4 | 15 ++++++++++
gl/m4/gnulib-cache.m4 | 3 +-
gl/m4/gnulib-comp.m4 | 14 ++++++++--
gl/m4/timespec.m4 | 15 ++++++++++
gl/netdb.in.h | 2 +-
gl/tests/Makefile.am | 9 ------
lib/gl/tests/test-func.c => gl/timespec.h | 41 ++++++++++++++---------------
lib/gl/netdb.in.h | 2 +-
lib/po/{zh_CN.po.in => zh_CN.po} | 0
13 files changed, 148 insertions(+), 44 deletions(-)
copy gl/{tests/test-sys_time.c => gettime.c} (56%)
rename gl/{tests => }/gettimeofday.c (100%)
create mode 100644 gl/m4/clock_time.m4
create mode 100644 gl/m4/gettime.m4
create mode 100644 gl/m4/timespec.m4
copy lib/gl/tests/test-func.c => gl/timespec.h (50%)
copy lib/po/{zh_CN.po.in => zh_CN.po} (100%)
diff --git a/gl/Makefile.am b/gl/Makefile.am
index cdcb1cb..3da19f8 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -9,7 +9,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override
--lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc
--tests-base=gl/tests --aux-dir=build-aux --with-tests --libtool
--macro-prefix=gl --no-vc-files accept arpa_inet autobuild bind close connect
error fdl-1.3 gendocs getaddrinfo getline getpass-gnu gnupload gpl-3.0
inet_ntop inet_pton lgpl-2.1 listen maintainer-makefile manywarnings minmax
perror pmccabe2html progname read-file readline recv select send setsockopt
shutdown socket sockets sys_stat update-copyright version-etc-fsf warnings
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override
--lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc
--tests-base=gl/tests --aux-dir=build-aux --with-tests --libtool
--macro-prefix=gl --no-vc-files accept arpa_inet autobuild bind close connect
error fdl-1.3 gendocs getaddrinfo getline getpass-gnu gettime gnupload gpl-3.0
inet_ntop inet_pton lgpl-2.1 listen maintainer-makefile manywarnings minmax
perror pmccabe2html progname read-file readline recv select send setsockopt
shutdown socket sockets sys_stat update-copyright version-etc-fsf warnings
AUTOMAKE_OPTIONS = 1.5 gnits
@@ -303,6 +303,24 @@ libgnu_la_SOURCES += gettext.h
## end gnulib module gettext-h
+## begin gnulib module gettime
+
+
+EXTRA_DIST += gettime.c
+
+EXTRA_libgnu_la_SOURCES += gettime.c
+
+## end gnulib module gettime
+
+## begin gnulib module gettimeofday
+
+
+EXTRA_DIST += gettimeofday.c
+
+EXTRA_libgnu_la_SOURCES += gettimeofday.c
+
+## end gnulib module gettimeofday
+
## begin gnulib module gnumakefile
distclean-local: clean-GNUmakefile
@@ -1134,6 +1152,13 @@ EXTRA_DIST += time.in.h
## end gnulib module time
+## begin gnulib module timespec
+
+
+EXTRA_DIST += timespec.h
+
+## end gnulib module timespec
+
## begin gnulib module unistd
BUILT_SOURCES += unistd.h
diff --git a/gl/tests/test-sys_time.c b/gl/gettime.c
similarity index 56%
copy from gl/tests/test-sys_time.c
copy to gl/gettime.c
index 2ab849e..044b26f 100644
--- a/gl/tests/test-sys_time.c
+++ b/gl/gettime.c
@@ -1,5 +1,6 @@
-/* Test of <sys/time.h> substitute.
- Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+/* gettime -- get the system clock
+
+ Copyright (C) 2002, 2004-2007, 2009-2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -14,16 +15,34 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-/* Written by Bruno Haible <address@hidden>, 2007. */
+/* Written by Paul Eggert. */
#include <config.h>
+#include "timespec.h"
+
#include <sys/time.h>
-struct timeval a;
+/* Get the system time into *TS. */
-int
-main (void)
+void
+gettime (struct timespec *ts)
{
- return 0;
+#if HAVE_NANOTIME
+ nanotime (ts);
+#else
+
+# if defined CLOCK_REALTIME && HAVE_CLOCK_GETTIME
+ if (clock_gettime (CLOCK_REALTIME, ts) == 0)
+ return;
+# endif
+
+ {
+ struct timeval tv;
+ gettimeofday (&tv, NULL);
+ ts->tv_sec = tv.tv_sec;
+ ts->tv_nsec = tv.tv_usec * 1000;
+ }
+
+#endif
}
diff --git a/gl/tests/gettimeofday.c b/gl/gettimeofday.c
similarity index 100%
rename from gl/tests/gettimeofday.c
rename to gl/gettimeofday.c
diff --git a/gl/m4/clock_time.m4 b/gl/m4/clock_time.m4
new file mode 100644
index 0000000..8be179d
--- /dev/null
+++ b/gl/m4/clock_time.m4
@@ -0,0 +1,31 @@
+# clock_time.m4 serial 10
+dnl Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Check for clock_gettime and clock_settime, and set LIB_CLOCK_GETTIME.
+# For a program named, say foo, you should add a line like the following
+# in the corresponding Makefile.am file:
+# foo_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+
+AC_DEFUN([gl_CLOCK_TIME],
+[
+ dnl Persuade glibc and Solaris <time.h> to declare these functions.
+ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
+ # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function.
+ # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
+
+ # Save and restore LIBS so e.g., -lrt, isn't added to it. Otherwise, *all*
+ # programs in the package would end up linked with that potentially-shared
+ # library, inducing unnecessary run-time overhead.
+ LIB_CLOCK_GETTIME=
+ AC_SUBST([LIB_CLOCK_GETTIME])
+ gl_saved_libs=$LIBS
+ AC_SEARCH_LIBS([clock_gettime], [rt posix4],
+ [test "$ac_cv_search_clock_gettime" = "none required" ||
+ LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
+ AC_CHECK_FUNCS([clock_gettime clock_settime])
+ LIBS=$gl_saved_libs
+])
diff --git a/gl/m4/gettime.m4 b/gl/m4/gettime.m4
new file mode 100644
index 0000000..9e7fde4
--- /dev/null
+++ b/gl/m4/gettime.m4
@@ -0,0 +1,15 @@
+# gettime.m4 serial 7
+dnl Copyright (C) 2002, 2004-2006, 2009-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_GETTIME],
+[
+ AC_LIBOBJ([gettime])
+
+ dnl Prerequisites of lib/gettime.c.
+ AC_REQUIRE([gl_CLOCK_TIME])
+ AC_REQUIRE([gl_TIMESPEC])
+ AC_CHECK_FUNCS_ONCE([gettimeofday nanotime])
+])
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index c3552d1..adad55b 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests
--aux-dir=build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files
accept arpa_inet autobuild bind close connect error fdl-1.3 gendocs getaddrinfo
getline getpass-gnu gnupload gpl-3.0 inet_ntop inet_pton lgpl-2.1 listen
maintainer-makefile manywarnings minmax perror pmccabe2html progname read-file
readline recv select send setsockopt shutdown socket sockets sys_stat
update-copyright version-etc-fsf warnings
+# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests
--aux-dir=build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files
accept arpa_inet autobuild bind close connect error fdl-1.3 gendocs getaddrinfo
getline getpass-gnu gettime gnupload gpl-3.0 inet_ntop inet_pton lgpl-2.1
listen maintainer-makefile manywarnings minmax perror pmccabe2html progname
read-file readline recv select send setsockopt shutdown socket sockets sys_stat
update-copyright version-etc-fsf warnings
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([gl/override])
@@ -32,6 +32,7 @@ gl_MODULES([
getaddrinfo
getline
getpass-gnu
+ gettime
gnupload
gpl-3.0
inet_ntop
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 4f08319..fd0b0da 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -65,6 +65,7 @@ AC_SUBST([LTALLOCA])
AC_LIBOBJ([bind])
fi
gl_SYS_SOCKET_MODULE_INDICATOR([bind])
+ gl_CLOCK_TIME
gl_FUNC_CLOSE
gl_UNISTD_MODULE_INDICATOR([close])
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
@@ -91,6 +92,9 @@ AC_SUBST([LTALLOCA])
gl_FUNC_GETPASS_GNU
AC_SUBST([LIBINTL])
AC_SUBST([LTLIBINTL])
+ gl_GETTIME
+ gl_FUNC_GETTIMEOFDAY
+ gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
# Autoconf 2.61a.99 and earlier don't support linking a file only
# in VPATH builds. But since GNUmakefile is for maintainer use
# only, it does not matter if we skip the link with older autoconf.
@@ -191,6 +195,7 @@ AC_SUBST([LTALLOCA])
gl_HEADER_SYS_TIME_H
AC_PROG_MKDIR_P
gl_HEADER_TIME_H
+ gl_TIMESPEC
gl_UNISTD_H
gl_FUNC_VASNPRINTF
gl_VERSION_ETC
@@ -237,8 +242,6 @@ AC_SUBST([LTALLOCA])
gl_COMMON
gl_source_base='gl/tests'
gl_FUNC_UNGETC_WORKS
- gl_FUNC_GETTIMEOFDAY
- gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
AC_C_BIGENDIAN
AC_C_BIGENDIAN
AC_REQUIRE([gl_HEADER_SYS_SOCKET])
@@ -393,6 +396,8 @@ AC_DEFUN([gl_FILE_LIST], [
lib/getpass.c
lib/getpass.h
lib/gettext.h
+ lib/gettime.c
+ lib/gettimeofday.c
lib/inet_ntop.c
lib/inet_pton.c
lib/intprops.h
@@ -440,6 +445,7 @@ AC_DEFUN([gl_FILE_LIST], [
lib/sys_stat.in.h
lib/sys_time.in.h
lib/time.in.h
+ lib/timespec.h
lib/unistd.in.h
lib/vasnprintf.c
lib/vasnprintf.h
@@ -453,6 +459,7 @@ AC_DEFUN([gl_FILE_LIST], [
m4/alloca.m4
m4/arpa_inet_h.m4
m4/autobuild.m4
+ m4/clock_time.m4
m4/close.m4
m4/errno_h.m4
m4/error.m4
@@ -464,6 +471,7 @@ AC_DEFUN([gl_FILE_LIST], [
m4/getdelim.m4
m4/getline.m4
m4/getpass.m4
+ m4/gettime.m4
m4/gettimeofday.m4
m4/gnulib-common.m4
m4/hostent.m4
@@ -512,6 +520,7 @@ AC_DEFUN([gl_FILE_LIST], [
m4/sys_stat_h.m4
m4/sys_time_h.m4
m4/time_h.m4
+ m4/timespec.m4
m4/ungetc.m4
m4/unistd_h.m4
m4/vasnprintf.m4
@@ -576,7 +585,6 @@ AC_DEFUN([gl_FILE_LIST], [
tests/test-wchar.c
tests/zerosize-ptr.h
tests=lib/dummy.c
- tests=lib/gettimeofday.c
tests=lib/ioctl.c
tests=lib/sys_ioctl.in.h
tests=lib/verify.h
diff --git a/gl/m4/timespec.m4 b/gl/m4/timespec.m4
new file mode 100644
index 0000000..5dbaed7
--- /dev/null
+++ b/gl/m4/timespec.m4
@@ -0,0 +1,15 @@
+#serial 14
+
+# Copyright (C) 2000-2001, 2003-2007, 2009-2010 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+dnl From Jim Meyering
+
+AC_DEFUN([gl_TIMESPEC],
+[
+ dnl Prerequisites of lib/timespec.h.
+ AC_REQUIRE([AC_C_INLINE])
+])
diff --git a/gl/netdb.in.h b/gl/netdb.in.h
index 6e0f966..dd0f2f0 100644
--- a/gl/netdb.in.h
+++ b/gl/netdb.in.h
@@ -90,7 +90,7 @@ struct addrinfo
# endif
# ifndef AI_ADDRCONFIG
# define AI_ADDRCONFIG 0 /* 0x0020: Use configuration of this host to choose
- returned address type.. */
+ returned address type. */
# endif
/* Error values for `getaddrinfo' function. */
diff --git a/gl/tests/Makefile.am b/gl/tests/Makefile.am
index a3a618c..cdf9763 100644
--- a/gl/tests/Makefile.am
+++ b/gl/tests/Makefile.am
@@ -148,15 +148,6 @@ EXTRA_DIST += test-getline.c signature.h macros.h
## end gnulib module getline-tests
-## begin gnulib module gettimeofday
-
-
-EXTRA_DIST += gettimeofday.c
-
-EXTRA_libtests_a_SOURCES += gettimeofday.c
-
-## end gnulib module gettimeofday
-
## begin gnulib module gettimeofday-tests
TESTS += test-gettimeofday
diff --git a/lib/gl/tests/test-func.c b/gl/timespec.h
similarity index 50%
copy from lib/gl/tests/test-func.c
copy to gl/timespec.h
index 476e04d..81b3423 100644
--- a/lib/gl/tests/test-func.c
+++ b/gl/timespec.h
@@ -1,5 +1,7 @@
-/* Test whether __func__ is available
- Copyright (C) 2008-2010 Free Software Foundation, Inc.
+/* timespec -- System time interface
+
+ Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2010 Free Software
+ Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -14,27 +16,24 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-/* Written by Bruno Haible <address@hidden>, 2008. */
-
-#include <config.h>
+#if ! defined TIMESPEC_H
+# define TIMESPEC_H
-#include <string.h>
+# include <time.h>
-#include "macros.h"
-
-int
-main ()
+/* Return negative, zero, positive if A < B, A == B, A > B, respectively.
+ Assume the nanosecond components are in range, or close to it. */
+static inline int
+timespec_cmp (struct timespec a, struct timespec b)
{
- ASSERT (strlen (__func__) > 0);
-
- /* On SunPRO C 5.9, sizeof __func__ evaluates to 0. The compiler warns:
- "warning: null dimension: sizeof()". */
-#if !defined __SUNPRO_C
- ASSERT (strlen (__func__) + 1 == sizeof __func__);
-#endif
+ return (a.tv_sec < b.tv_sec ? -1
+ : a.tv_sec > b.tv_sec ? 1
+ : a.tv_nsec < b.tv_nsec ? -1
+ : a.tv_nsec > b.tv_nsec ? 1
+ : 0);
+}
- ASSERT (strcmp (__func__, "main") == 0
- || strcmp (__func__, "<unknown function>") == 0);
+void gettime (struct timespec *);
+int settime (struct timespec const *);
- return 0;
-}
+#endif
diff --git a/lib/gl/netdb.in.h b/lib/gl/netdb.in.h
index 05b2f11..d4b4467 100644
--- a/lib/gl/netdb.in.h
+++ b/lib/gl/netdb.in.h
@@ -90,7 +90,7 @@ struct addrinfo
# endif
# ifndef AI_ADDRCONFIG
# define AI_ADDRCONFIG 0 /* 0x0020: Use configuration of this host to choose
- returned address type.. */
+ returned address type. */
# endif
/* Error values for `getaddrinfo' function. */
diff --git a/lib/po/zh_CN.po.in b/lib/po/zh_CN.po
similarity index 100%
copy from lib/po/zh_CN.po.in
copy to lib/po/zh_CN.po
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-143-gf5ad381,
Simon Josefsson <=