[glibc] 01/01: hurd: Fix remaining linknamespace issues
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 b871bbf848c3b71aa12a01af1ee8f03bb3907091
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Sep 27 23:20:49 2017 +0000
hurd: Fix remaining linknamespace issues
- patches/hurd-i386/tg-ifaddrs_v6.diff: Update.
- patches/hurd-i386/git-dirfd-linknamespace.diff: New patch.
- patches/hurd-i386/git-revoke-linknamespace.diff: New patch.
- patches/hurd-i386/git-seekdir.diff: New patch.
- patches/hurd-i386/git-ifaddrs.diff: New patch.
- testsuite-xfail-debian.mk: Update.
---
debian/changelog | 5 +++++
debian/patches/hurd-i386/tg-ifaddrs_v6.diff | 26 +++++++++++++++-----------
debian/patches/series | 4 ++++
debian/testsuite-xfail-debian.mk | 27 ---------------------------
4 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7814403..c3f01da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -88,6 +88,11 @@ glibc (2.26-0experimental0) UNRELEASED; urgency=medium
- patches/hurd-i386/tg-sendmsg-SCM_CREDS.diff: Update.
- patches/hurd-i386/git-sigsuspend_not_cancel.diff: New patch.
- patches/hurd-i386/tg-sysvshm.diff: Update.
+ - patches/hurd-i386/tg-ifaddrs_v6.diff: Update.
+ - patches/hurd-i386/git-dirfd-linknamespace.diff: New patch.
+ - patches/hurd-i386/git-revoke-linknamespace.diff: New patch.
+ - patches/hurd-i386/git-seekdir.diff: New patch.
+ - patches/hurd-i386/git-ifaddrs.diff: New patch.
- testsuite-xfail-debian.mk: Update.
- testsuite-xfail-debian.mk: Remove now-removed XPG3 entries.
diff --git a/debian/patches/hurd-i386/tg-ifaddrs_v6.diff b/debian/patches/hurd-i386/tg-ifaddrs_v6.diff
index 5b522e4..ddbe9b0 100644
--- a/debian/patches/hurd-i386/tg-ifaddrs_v6.diff
+++ b/debian/patches/hurd-i386/tg-ifaddrs_v6.diff
@@ -8,17 +8,17 @@ IPv6 addresses. This takes another, ugly, approach, by parsing fsysopts
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
- sysdeps/mach/hurd/ifaddrs.c | 306 ++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 306 insertions(+)
+ sysdeps/mach/hurd/ifaddrs.c | 310 ++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 310 insertions(+)
diff --git a/sysdeps/mach/hurd/ifaddrs.c b/sysdeps/mach/hurd/ifaddrs.c
new file mode 100644
-index 0000000..4afc749
+index 0000000000..a07bd97715
--- /dev/null
+++ b/sysdeps/mach/hurd/ifaddrs.c
-@@ -0,0 +1,306 @@
+@@ -0,0 +1,310 @@
+/* getifaddrs -- get names and addresses of all network interfaces
-+ Copyright (C) 2013 Free Software Foundation, Inc.
++ Copyright (C) 2013-2015 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
@@ -55,7 +55,7 @@ index 0000000..4afc749
+ network interface on the host machine. If successful, store the
+ list in *IFAP and return 0. On errors, return -1 and set `errno'. */
+int
-+getifaddrs (struct ifaddrs **ifap)
++__getifaddrs (struct ifaddrs **ifap)
+{
+ /* XXX: Hackish. This assumes pfinet parameter style, and that the same
+ pfinet is on /servers/socket/2 and /servers/socket/26.
@@ -251,7 +251,7 @@ index 0000000..4afc749
+ }
+ else
+ {
-+ addr = strndup (addr, cidr_a - addr);
++ addr = __strndup (addr, cidr_a - addr);
+ cidr = atoi (cidr_a + 1);
+ }
+
@@ -313,15 +313,19 @@ index 0000000..4afc749
+
+ return 0;
+}
++weak_alias (__getifaddrs, getifaddrs)
++libc_hidden_def (__getifaddrs)
+#ifndef getifaddrs
-+libc_hidden_def (getifaddrs)
++libc_hidden_weak (getifaddrs)
+#endif
+
+void
-+freeifaddrs (struct ifaddrs *ifa)
++__freeifaddrs (struct ifaddrs *ifa)
+{
+ free (ifa);
+}
-+libc_hidden_def (freeifaddrs)
++weak_alias (__freeifaddrs, freeifaddrs)
++libc_hidden_def (__freeifaddrs)
++libc_hidden_weak (freeifaddrs)
--
-tg: (4a7fa7e..) t/ifaddrs_v6 (depends on: baseline)
+tg: (7bb5f8a836..) t/ifaddrs_v6 (depends on: baseline)
diff --git a/debian/patches/series b/debian/patches/series
index 9802090..1dea679 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -164,6 +164,10 @@ hurd-i386/git-socket-limit.diff
hurd-i386/tg-thread-linkspace.diff
hurd-i386/git-clock_gettime_gettimeofday.diff
hurd-i386/git-sigsuspend_not_cancel.diff
+hurd-i386/git-dirfd-linknamespace.diff
+hurd-i386/git-revoke-linknamespace.diff
+hurd-i386/git-seekdir-linknamespace.diff
+hurd-i386/git-ifaddrs-linknamespace.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 5e77d23..f03b043 100644
--- a/debian/testsuite-xfail-debian.mk
+++ b/debian/testsuite-xfail-debian.mk
@@ -235,12 +235,6 @@ 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-POSIX/dirent.h/linknamespace = yes
-test-xfail-UNIX98/ftw.h/linknamespace = yes
-test-xfail-XOPEN2K/ftw.h/linknamespace = yes
-test-xfail-XPG4/ftw.h/linknamespace = yes
-test-xfail-XPG4/sys/shm.h/linknamespace = yes
-
# new in 2.22
test-xfail-tst-audit3 = yes
test-xfail-tst-prelink = yes
@@ -276,22 +270,6 @@ test-xfail-XPG4/sys/ipc.h/conform = yes
test-xfail-XPG4/sys/msg.h/conform = yes
test-xfail-XPG4/sys/shm.h/conform = yes
-test-xfail-POSIX2008/dirent.h/linknamespace = yes
-test-xfail-POSIX2008/netdb.h/linknamespace = yes
-test-xfail-POSIX/glob.h/linknamespace = yes
-test-xfail-POSIX/wordexp.h/linknamespace = yes
-test-xfail-UNIX98/glob.h/linknamespace = yes
-test-xfail-UNIX98/stdlib.h/linknamespace = yes
-test-xfail-UNIX98/wordexp.h/linknamespace = yes
-test-xfail-XOPEN2K8/netdb.h/linknamespace = yes
-test-xfail-XOPEN2K8/stdlib.h/linknamespace = yes
-test-xfail-XOPEN2K/glob.h/linknamespace = yes
-test-xfail-XOPEN2K/netdb.h/linknamespace = yes
-test-xfail-XOPEN2K/stdlib.h/linknamespace = yes
-test-xfail-XOPEN2K/wordexp.h/linknamespace = yes
-test-xfail-XPG4/glob.h/linknamespace = yes
-test-xfail-XPG4/wordexp.h/linknamespace = yes
-
# changed in 2.22, tests were run directly, now using threads
# TODO: should be succeeding again with gnumach >= 2016-03-06
test-xfail-test-fpucw = yes
@@ -371,11 +349,6 @@ test-xfail-XPG42/sys/statvfs.h/conform = yes
test-xfail-XPG42/sys/un.h/conform = yes
test-xfail-XPG42/termios.h/conform = yes
-test-xfail-XPG42/ftw.h/linknamespace = yes
-test-xfail-XPG42/glob.h/linknamespace = yes
-test-xfail-XPG42/stdlib.h/linknamespace = yes
-test-xfail-XPG42/wordexp.h/linknamespace = yes
-
# will be fixed in hurd >= 20170926
test-xfail-tst-bug18665-tcp = yes
test-xfail-tst-resolv-basic = yes
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: