[glibc] 01/01: Rebase hurd-only patches
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.27
in repository glibc.
commit 0c30ca8e7a546c7a20e7ee0aeea197527d1d3161
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 6 01:14:17 2018 +0000
Rebase hurd-only patches
* debian/patches/hurd-i386/submitted-net.diff: rebased.
* debian/patches/hurd-i386/unsubmitted-prof-eintr.diff: rebased.
---
debian/changelog | 8 ++++++
debian/patches/hurd-i386/submitted-net.diff | 32 ++++++++++++----------
.../patches/hurd-i386/unsubmitted-prof-eintr.diff | 2 +-
3 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index da27429..d3828db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+glibc (2.26.9000+20180105.a6d0afb5-0experimental1) UNRELEASED; urgency=medium
+
+ [ Samuel Thibault ]
+ * debian/patches/hurd-i386/submitted-net.diff: rebased.
+ * debian/patches/hurd-i386/unsubmitted-prof-eintr.diff: rebased.
+
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 05 Jan 2018 22:08:07 +0100
+
glibc (2.26.9000+20180105.a6d0afb5-0experimental0) experimental; urgency=medium
* New upstream snapshot from 20180105:
diff --git a/debian/patches/hurd-i386/submitted-net.diff b/debian/patches/hurd-i386/submitted-net.diff
index 18ec6c2..0faefd0 100644
--- a/debian/patches/hurd-i386/submitted-net.diff
+++ b/debian/patches/hurd-i386/submitted-net.diff
@@ -96,7 +96,7 @@ Index: eglibc-2.16/sysdeps/gnu/net/ethernet.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ eglibc-2.16/sysdeps/gnu/net/ethernet.h 2012-07-23 00:21:13.000000000 +0200
@@ -0,0 +1,84 @@
-+/* Copyright (C) 1997-2017 Free Software Foundation, Inc.
++/* Copyright (C) 1997-2018 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
@@ -184,9 +184,9 @@ Index: eglibc-2.16/sysdeps/gnu/net/if_arp.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ eglibc-2.16/sysdeps/gnu/net/if_arp.h 2012-07-23 00:21:13.000000000 +0200
-@@ -0,0 +1,182 @@
+@@ -0,0 +1,183 @@
+/* Definitions for Address Resolution Protocol.
-+ Copyright (C) 1997-2017 Free Software Foundation, Inc.
++ Copyright (C) 1997-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
@@ -288,6 +288,7 @@ Index: eglibc-2.16/sysdeps/gnu/net/if_arp.h
+#define ARPHRD_LAPB 516 /* LAPB. */
+#define ARPHRD_DDCMP 517 /* Digital's DDCMP. */
+#define ARPHRD_RAWHDLC 518 /* Raw HDLC. */
++#define ARPHRD_RAWIP 519 /* Raw IP. */
+
+#define ARPHRD_TUNNEL 768 /* IPIP tunnel. */
+#define ARPHRD_TUNNEL6 769 /* IPIP6 tunnel. */
@@ -372,7 +373,7 @@ Index: eglibc-2.16/sysdeps/gnu/net/if_ether.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ eglibc-2.16/sysdeps/gnu/net/if_ether.h 2012-07-23 00:21:13.000000000 +0200
@@ -0,0 +1,115 @@
-+/* Copyright (C) 1997-2017 Free Software Foundation, Inc.
++/* Copyright (C) 1997-2018 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
@@ -668,7 +669,7 @@ Index: eglibc-2.16/sysdeps/gnu/net/route.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ eglibc-2.16/sysdeps/gnu/net/route.h 2012-07-23 00:21:13.000000000 +0200
@@ -0,0 +1,144 @@
-+/* Copyright (C) 1997-2017 Free Software Foundation, Inc.
++/* Copyright (C) 1997-2018 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
@@ -817,7 +818,7 @@ Index: eglibc-2.16/sysdeps/gnu/netinet/if_ether.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ eglibc-2.16/sysdeps/gnu/netinet/if_ether.h 2012-07-23 00:21:13.000000000 +0200
@@ -0,0 +1,103 @@
-+/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
++/* Copyright (C) 1996-2018 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
@@ -939,7 +940,7 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/ethernet.h
--- eglibc-2.16.orig/sysdeps/mach/hurd/net/ethernet.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
--/* Copyright (C) 1997-2017 Free Software Foundation, Inc.
+-/* Copyright (C) 1997-2018 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
@@ -1020,7 +1021,7 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/if_arp.h
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-/* Definitions for Address Resolution Protocol.
-- Copyright (C) 1997-2017 Free Software Foundation, Inc.
+- Copyright (C) 1997-2018 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
@@ -1168,7 +1169,7 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/if_ether.h
--- eglibc-2.16.orig/sysdeps/mach/hurd/net/if_ether.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
--/* Copyright (C) 1997-2017 Free Software Foundation, Inc.
+-/* Copyright (C) 1997-2018 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
@@ -1434,7 +1435,7 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/route.h
--- eglibc-2.16.orig/sysdeps/mach/hurd/net/route.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
--/* Copyright (C) 1997-2017 Free Software Foundation, Inc..
+-/* Copyright (C) 1997-2018 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
@@ -1593,7 +1594,7 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/ethernet.h
--- eglibc-2.16.orig/sysdeps/unix/sysv/linux/net/ethernet.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
--/* Copyright (C) 1997-2017 Free Software Foundation, Inc.
+-/* Copyright (C) 1997-2018 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
@@ -1681,9 +1682,9 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/if_arp.h
===================================================================
--- eglibc-2.16.orig/sysdeps/unix/sysv/linux/net/if_arp.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,182 +0,0 @@
+@@ -1,183 +0,0 @@
-/* Definitions for Address Resolution Protocol.
-- Copyright (C) 1997-2017 Free Software Foundation, Inc.
+- Copyright (C) 1997-2018 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
@@ -1785,6 +1786,7 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/if_arp.h
-#define ARPHRD_LAPB 516 /* LAPB. */
-#define ARPHRD_DDCMP 517 /* Digital's DDCMP. */
-#define ARPHRD_RAWHDLC 518 /* Raw HDLC. */
+-#define ARPHRD_RAWIP 519 /* Raw IP. */
-
-#define ARPHRD_TUNNEL 768 /* IPIP tunnel. */
-#define ARPHRD_TUNNEL6 769 /* IPIP6 tunnel. */
@@ -2057,7 +2059,7 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/route.h
--- eglibc-2.16.orig/sysdeps/unix/sysv/linux/net/route.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
--/* Copyright (C) 1997-2017 Free Software Foundation, Inc.
+-/* Copyright (C) 1997-2018 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
@@ -2206,7 +2208,7 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/netinet/if_ether.h
--- eglibc-2.16.orig/sysdeps/unix/sysv/linux/netinet/if_ether.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
--/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
+-/* Copyright (C) 1996-2018 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
diff --git a/debian/patches/hurd-i386/unsubmitted-prof-eintr.diff b/debian/patches/hurd-i386/unsubmitted-prof-eintr.diff
index 630f1b6..6358389 100644
--- a/debian/patches/hurd-i386/unsubmitted-prof-eintr.diff
+++ b/debian/patches/hurd-i386/unsubmitted-prof-eintr.diff
@@ -13,7 +13,7 @@ Index: glibc-2.22/gmon/gmon.c
if (fd == -1)
{
+ do
- fd = open_not_cancel ("gmon.out", O_CREAT|O_TRUNC|O_WRONLY|O_NOFOLLOW,
+ fd = __open_nocancel ("gmon.out", O_CREAT|O_TRUNC|O_WRONLY|O_NOFOLLOW,
0666);
+ while (fd < 0 && errno == EINTR);
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: