[glibc] branch glibc-2.25 updated (fc4d9f0 -> 1616edc)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[glibc] branch glibc-2.25 updated (fc4d9f0 -> 1616edc)

Samuel Thibault-4
This is an automated email from the git hooks/post-receive script.

sthibault pushed a change to branch glibc-2.25
in repository glibc.

      from  fc4d9f0   submitted-tst-rfc3484.diff: Fix ____strtoull_l_internal define
       new  1616edc   Use upstream commit to fix __inet6_scopeid_pton issue

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog                                   |   2 +-
 .../hurd-i386/git-__inet6_scopeid_pton.diff        |  39 +++++++
 .../patches/hurd-i386/submitted-tst-rfc3484.diff   | 115 ---------------------
 debian/patches/series                              |   2 +-
 4 files changed, 41 insertions(+), 117 deletions(-)
 create mode 100644 debian/patches/hurd-i386/git-__inet6_scopeid_pton.diff
 delete mode 100644 debian/patches/hurd-i386/submitted-tst-rfc3484.diff

--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[glibc] 01/01: Use upstream commit to fix __inet6_scopeid_pton issue

Samuel Thibault-4
This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch glibc-2.25
in repository glibc.

commit 1616edce72e04b98b653500b0f5bff603a4725d9
Author: Samuel Thibault <[hidden email]>
Date:   Thu Aug 10 23:44:37 2017 +0000

    Use upstream commit to fix __inet6_scopeid_pton issue
   
    Replace
    hurd-i386/submitted-tst-rfc3484.diff
    by upstream fix
    hurd-i386/git-__inet6_scopeid_pton.diff
---
 debian/changelog                                   |   2 +-
 .../hurd-i386/git-__inet6_scopeid_pton.diff        |  39 +++++++
 .../patches/hurd-i386/submitted-tst-rfc3484.diff   | 115 ---------------------
 debian/patches/series                              |   2 +-
 4 files changed, 41 insertions(+), 117 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9276e93..fb88650 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ glibc (2.25-0experimental1) UNRELEASED; urgency=medium
   * patches/hurd-i386/submitted-shm_open_pthread.diff: new patch.
   * patches/hurd-i386/cvs-libc_init_secure.diff: new patch.
   * patches/hurd-i386/cvs-libpthread.diff: update.
-  * patches/hurd-i386/submitted-tst-rfc3484.diff: new patch.
+  * patches/hurd-i386/git-__inet6_scopeid_pton.diff: new patch from upstream.
   * patches/hurd-i386/tg2.25-tls.diff: new patch.
   * testsuite-xfail-debian.mk: update for hurd-i386.
 
diff --git a/debian/patches/hurd-i386/git-__inet6_scopeid_pton.diff b/debian/patches/hurd-i386/git-__inet6_scopeid_pton.diff
new file mode 100644
index 0000000..63fd7e7
--- /dev/null
+++ b/debian/patches/hurd-i386/git-__inet6_scopeid_pton.diff
@@ -0,0 +1,39 @@
+commit f87cc2bfba9b844da48a63441c6099342b1551c7
+Author: Florian Weimer <[hidden email]>
+Date:   Thu Aug 10 16:06:52 2017 +0200
+
+    __inet6_scopeid_pton: Remove attribute_hidden, internal_function
+    
+    The hidden attribute was overridden by libc_hidden_proto on GNU/Linux.
+    It is incorrect because the function is used from nscd.
+    
+    internal_function is not supposed to be used across DSO boundaries,
+    so this commit removes it (again, due to the use in nscd).
+
+diff --git a/inet/inet6_scopeid_pton.c b/inet/inet6_scopeid_pton.c
+index e09b1cb34d..cc8803fa10 100644
+--- a/inet/inet6_scopeid_pton.c
++++ b/inet/inet6_scopeid_pton.c
+@@ -28,7 +28,7 @@
+
+ /* Parse SOURCE as a scope ID for ADDRESS.  Return 0 on success and -1
+    on error.  */
+-internal_function int
++int
+ __inet6_scopeid_pton (const struct in6_addr *address, const char *scope,
+                       uint32_t *result)
+ {
+diff --git a/inet/net-internal.h b/inet/net-internal.h
+index 2b2632c7ba..b2135893e8 100644
+--- a/inet/net-internal.h
++++ b/inet/net-internal.h
+@@ -25,8 +25,7 @@
+ #include <sys/time.h>
+
+ int __inet6_scopeid_pton (const struct in6_addr *address,
+-                          const char *scope, uint32_t *result)
+-  internal_function attribute_hidden;
++                          const char *scope, uint32_t *result);
+ libc_hidden_proto (__inet6_scopeid_pton)
+
+
diff --git a/debian/patches/hurd-i386/submitted-tst-rfc3484.diff b/debian/patches/hurd-i386/submitted-tst-rfc3484.diff
deleted file mode 100644
index cee6a24..0000000
--- a/debian/patches/hurd-i386/submitted-tst-rfc3484.diff
+++ /dev/null
@@ -1,115 +0,0 @@
-https://sourceware.org/ml/libc-alpha/2017-08/msg00060.html
-
-Define missing __inet6_scopeid_pton internal function used by getaddrinfo
-
-* posix/tst-rfc3484.c: Include <netinet/in.h> and <net/if.h>
-(__inet6_scopeid_pton): New function.
-* posix/tst-rfc3484-2.c: Include <netinet/in.h> and <net/if.h>
-(__inet6_scopeid_pton): New function.
-* posix/tst-rfc3484-3.c: Include <netinet/in.h> and <net/if.h>
-(__inet6_scopeid_pton): New function.
-
-Index: glibc-2.25/posix/tst-rfc3484.c
-===================================================================
---- glibc-2.25.orig/posix/tst-rfc3484.c
-+++ glibc-2.25/posix/tst-rfc3484.c
-@@ -2,6 +2,8 @@
- #include <stdio.h>
- #include <ifaddrs.h>
- #include <stdint.h>
-+#include <netinet/in.h>
-+#include <net/if.h>
-
- /* Internal definitions used in the libc code.  */
- #define __getservbyname_r getservbyname_r
-@@ -55,6 +57,15 @@ _res_hconf_init (void)
- {
- }
-
-+int
-+internal_function
-+__inet6_scopeid_pton (const struct in6_addr *address, const char *scope,
-+                      uint32_t *result)
-+{
-+  *result = if_nametoindex(scope);
-+  return 0;
-+}
-+
- #undef USE_NSCD
- #include "../sysdeps/posix/getaddrinfo.c"
-
-Index: glibc-2.25/posix/tst-rfc3484-2.c
-===================================================================
---- glibc-2.25.orig/posix/tst-rfc3484-2.c
-+++ glibc-2.25/posix/tst-rfc3484-2.c
-@@ -2,6 +2,8 @@
- #include <stdio.h>
- #include <ifaddrs.h>
- #include <stdint.h>
-+#include <netinet/in.h>
-+#include <net/if.h>
-
- /* Internal definitions used in the libc code.  */
- #define __getservbyname_r getservbyname_r
-@@ -55,6 +57,15 @@ _res_hconf_init (void)
- {
- }
-
-+int
-+internal_function
-+__inet6_scopeid_pton (const struct in6_addr *address, const char *scope,
-+                      uint32_t *result)
-+{
-+  *result = if_nametoindex(scope);
-+  return 0;
-+}
-+
- #undef USE_NSCD
- #include "../sysdeps/posix/getaddrinfo.c"
-
-Index: glibc-2.25/posix/tst-rfc3484-3.c
-===================================================================
---- glibc-2.25.orig/posix/tst-rfc3484-3.c
-+++ glibc-2.25/posix/tst-rfc3484-3.c
-@@ -2,6 +2,8 @@
- #include <stdio.h>
- #include <ifaddrs.h>
- #include <stdint.h>
-+#include <netinet/in.h>
-+#include <net/if.h>
-
- /* Internal definitions used in the libc code.  */
- #define __getservbyname_r getservbyname_r
-@@ -55,6 +57,15 @@ _res_hconf_init (void)
- {
- }
-
-+int
-+internal_function
-+__inet6_scopeid_pton (const struct in6_addr *address, const char *scope,
-+                      uint32_t *result)
-+{
-+  *result = if_nametoindex(scope);
-+  return 0;
-+}
-+
- #undef USE_NSCD
- #include "../sysdeps/posix/getaddrinfo.c"
-
-Index: glibc-2.25/inet/tst-inet6_scopeid_pton.c
-===================================================================
---- glibc-2.25.orig/inet/tst-inet6_scopeid_pton.c
-+++ glibc-2.25/inet/tst-inet6_scopeid_pton.c
-@@ -22,6 +22,12 @@
- #include <net/if.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <ctype.h>
-+
-+#define isdigit_l(c, locale) isdigit(c)
-+#define ____strtoull_l_internal(s, end, base, group, locale) strtoull(s, end, base)
-+#define __if_nametoindex if_nametoindex
-+#include "inet6_scopeid_pton.c"
-
- /* An interface which is known to the system.  */
- static const char *interface_name;
diff --git a/debian/patches/series b/debian/patches/series
index a8e1422..ced8b11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -136,8 +136,8 @@ hurd-i386/tg-magic-pid.diff
 hurd-i386/tg-mlockall.diff
 hurd-i386/submitted-shm_open_pthread.diff
 hurd-i386/cvs-libc_init_secure.diff
-hurd-i386/submitted-tst-rfc3484.diff
 hurd-i386/tg2.25-tls.diff
+hurd-i386/git-__inet6_scopeid_pton.diff
 
 i386/local-biarch.diff
 i386/local-cmov.diff

--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git

Loading...