[glibc] 01/01: Fix symbol exposition
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.26
in repository glibc.
commit bdfd1a3c438cfb406b32f9b15e42d7d18398d2f4
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Sep 25 00:02:49 2017 +0000
Fix symbol exposition
- patches/hurd-i386/git-clock_gettime_gettimeofday.diff: New patch.
- testsuite-xfail-debian.mk: Update. Also remove tests inexistent in
XPG4.
---
debian/changelog | 3 +-
.../hurd-i386/git-clock_gettime_gettimeofday.diff | 52 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/testsuite-xfail-debian.mk | 10 -----
4 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cfc5c08..4995eb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -83,7 +83,8 @@ glibc (2.26-0experimental0) UNRELEASED; urgency=medium
- patches/hurd-i386/git-dl-sysdep-check.diff: New patch.
- patches/hurd-i386/git-socket-limit.diff: New patch.
- patches/hurd-i386/tg-thread-linkspace.diff: New patch.
- - testsuite-xfail-debian.mk: Update for hurd-i386.
+ - patches/hurd-i386/git-clock_gettime_gettimeofday.diff: New patch.
+ - testsuite-xfail-debian.mk: Update.
- testsuite-xfail-debian.mk: Remove now-removed XPG3 entries.
-- Adam Conrad <adconrad@0c3.net> Sat, 02 Sep 2017 12:15:10 -0600
diff --git a/debian/patches/hurd-i386/git-clock_gettime_gettimeofday.diff b/debian/patches/hurd-i386/git-clock_gettime_gettimeofday.diff
new file mode 100644
index 0000000..480c4e1
--- /dev/null
+++ b/debian/patches/hurd-i386/git-clock_gettime_gettimeofday.diff
@@ -0,0 +1,52 @@
+commit fcafcd162c843364dc2bb8d57bd239c41cfd122c
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Mon Sep 25 01:55:02 2017 +0200
+
+ hurd: Fix exposition of s/gettimeofday through timespec_s/get
+
+ conform/ISO11/time.h/linknamespace complains that using timespec_get exposes
+ gettimeofday.
+
+ conform/POSIX/time.h/linknamespace complains that using clock_settime
+ exposes settimeofday.
+
+ * sysdeps/unix/clock_gettime.c (realtime_gettime, __clock_gettime): Use
+ __gettimeofday instead of gettimeofday.
+ * sysdeps/unix/clock_settime.c (__clock_settime): Use __settimeofday
+ instead of settimeofday.
+
+diff --git a/sysdeps/unix/clock_gettime.c b/sysdeps/unix/clock_gettime.c
+index 5262066f51..c4cf49367e 100644
+--- a/sysdeps/unix/clock_gettime.c
++++ b/sysdeps/unix/clock_gettime.c
+@@ -79,7 +79,7 @@ static inline int
+ realtime_gettime (struct timespec *tp)
+ {
+ struct timeval tv;
+- int retval = gettimeofday (&tv, NULL);
++ int retval = __gettimeofday (&tv, NULL);
+ if (retval == 0)
+ /* Convert into `timespec'. */
+ TIMEVAL_TO_TIMESPEC (&tv, tp);
+@@ -103,7 +103,7 @@ __clock_gettime (clockid_t clock_id, struct timespec *tp)
+ case CLOCK_REALTIME:
+ {
+ struct timeval tv;
+- retval = gettimeofday (&tv, NULL);
++ retval = __gettimeofday (&tv, NULL);
+ if (retval == 0)
+ TIMEVAL_TO_TIMESPEC (&tv, tp);
+ }
+diff --git a/sysdeps/unix/clock_settime.c b/sysdeps/unix/clock_settime.c
+index e744cae6a9..067e279e2a 100644
+--- a/sysdeps/unix/clock_settime.c
++++ b/sysdeps/unix/clock_settime.c
+@@ -89,7 +89,7 @@ __clock_settime (clockid_t clock_id, const struct timespec *tp)
+ struct timeval tv; \
+ TIMESPEC_TO_TIMEVAL (&tv, tp); \
+ \
+- retval = settimeofday (&tv, NULL); \
++ retval = __settimeofday (&tv, NULL); \
+ } while (0)
+
+ #ifdef SYSDEP_SETTIME
diff --git a/debian/patches/series b/debian/patches/series
index 6a45ce6..725815c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -162,6 +162,7 @@ hurd-i386/git-hidden-def-2.diff
hurd-i386/git-dl-sysdep-check.diff
hurd-i386/git-socket-limit.diff
hurd-i386/tg-thread-linkspace.diff
+hurd-i386/git-clock_gettime_gettimeofday.diff
i386/local-biarch.diff
i386/unsubmitted-quiet-ldconfig.diff
diff --git a/debian/testsuite-xfail-debian.mk b/debian/testsuite-xfail-debian.mk
index cb3840c..b2172b7 100644
--- a/debian/testsuite-xfail-debian.mk
+++ b/debian/testsuite-xfail-debian.mk
@@ -234,11 +234,6 @@ test-xfail-XOPEN2K8/mqueue.h/conform = yes
test-xfail-XOPEN2K8/pthread.h/conform = yes
test-xfail-XOPEN2K8/sys/stat.h/conform = yes
test-xfail-XOPEN2K/sys/stat.h/conform = yes
-test-xfail-XPG4/sys/resource.h/conform = yes
-test-xfail-XPG4/sys/statvfs.h/conform = yes
-test-xfail-XPG4/sys/un.h/conform = yes
-
-test-xfail-ISO11/time.h/linknamespace = yes
test-xfail-POSIX2008/aio.h/linknamespace = yes
test-xfail-POSIX2008/arpa/inet.h/linknamespace = yes
@@ -451,10 +446,8 @@ test-xfail-XPG4/poll.h/linknamespace = yes
test-xfail-XPG4/signal.h/linknamespace = yes
test-xfail-XPG4/stropts.h/linknamespace = yes
test-xfail-XPG4/sys/mman.h/linknamespace = yes
-test-xfail-XPG4/sys/resource.h/linknamespace = yes
test-xfail-XPG4/sys/shm.h/linknamespace = yes
test-xfail-XPG4/sys/socket.h/linknamespace = yes
-test-xfail-XPG4/sys/statvfs.h/linknamespace = yes
test-xfail-XPG4/sys/time.h/linknamespace = yes
test-xfail-XPG4/sys/uio.h/linknamespace = yes
test-xfail-XPG4/ucontext.h/linknamespace = yes
@@ -910,18 +903,15 @@ test-xfail-XPG4/stropts.h/conform = yes
test-xfail-XPG4/sys/ipc.h/conform = yes
test-xfail-XPG4/sys/mman.h/conform = yes
test-xfail-XPG4/sys/msg.h/conform = yes
-test-xfail-XPG4/sys/resource.h/conform = yes
test-xfail-XPG4/sys/sem.h/conform = yes
test-xfail-XPG4/sys/shm.h/conform = yes
test-xfail-XPG4/sys/socket.h/conform = yes
test-xfail-XPG4/sys/stat.h/conform = yes
-test-xfail-XPG4/sys/statvfs.h/conform = yes
test-xfail-XPG4/sys/time.h/conform = yes
test-xfail-XPG4/sys/timeb.h/conform = yes
test-xfail-XPG4/sys/times.h/conform = yes
test-xfail-XPG4/sys/types.h/conform = yes
test-xfail-XPG4/sys/uio.h/conform = yes
-test-xfail-XPG4/sys/un.h/conform = yes
test-xfail-XPG4/termios.h/conform = yes
test-xfail-XPG4/time.h/conform = yes
test-xfail-XPG4/unistd.h/conform = yes
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: