[glibc] 01/01: Refresh hurd-i386 specific patches: - debian/patches/hurd-i386/submitted-net.diff: refreshed. - debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff: refreshed. - debian/patches/hurd-i386/tg-fcntl-internal.h.diff: upstreamed. - debian/patches/hurd-i386/tg-pagesize.diff: refreshed.

To: debian-glibc@lists.debian.org
Subject: [glibc] 01/01: Refresh hurd-i386 specific patches: - debian/patches/hurd-i386/submitted-net.diff: refreshed. - debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff: refreshed. - debian/patches/hurd-i386/tg-fcntl-internal.h.diff: upstreamed. - debian/patches/hurd-i386/tg-pagesize.diff: refreshed.
From: Aurelien Jarno <aurel32@moszumanska.debian.org>
Date: Sat, 03 Feb 2018 14:19:51 +0000
Message-id: <[🔎] E1ehyfW-0000DM-Tr@moszumanska.debian.org>
Reply-to: Aurelien Jarno <aurelien@aurel32.net>
In-reply-to: <[🔎] 20180203141950.734.11766@moszumanska.debian.org>
References: <[🔎] 20180203141950.734.11766@moszumanska.debian.org>
This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch glibc-2.27
in repository glibc.

commit 555e8eba05c16bf08da1ab1475862cd319f96668
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Sat Feb 3 15:16:48 2018 +0100

    Refresh hurd-i386 specific patches:
      - debian/patches/hurd-i386/submitted-net.diff: refreshed.
      - debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff: refreshed.
      - debian/patches/hurd-i386/tg-fcntl-internal.h.diff: upstreamed.
      - debian/patches/hurd-i386/tg-pagesize.diff: refreshed.
---
 debian/changelog                                   |   4 +
 .../hurd-i386/local-clock_gettime_MONOTONIC.diff   |  26 ++--
 debian/patches/hurd-i386/submitted-net.diff        | 141 +++++++++++----------
 debian/patches/hurd-i386/tg-fcntl-internal.h.diff  |  79 ------------
 debian/patches/hurd-i386/tg-pagesize.diff          |  18 ++-
 debian/patches/series.hurd-i386                    |   1 -
 6 files changed, 100 insertions(+), 169 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8141a83..7e68a79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,10 @@ glibc (2.27-0experimental0) UNRELEASED; urgency=medium
     - debian/patches/hurd-i386/tg-extern_inline.diff: upstreamed.
     - debian/patches/hurd-i386/tg-gsync-libc.diff: upstreamed.
     - debian/patches/hurd-i386/tg2.26-sigsetops.h.diff: upstreamed.
+    - debian/patches/hurd-i386/submitted-net.diff: refreshed.
+    - debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff: refreshed.
+    - debian/patches/hurd-i386/tg-fcntl-internal.h.diff: upstreamed.
+    - debian/patches/hurd-i386/tg-pagesize.diff: refreshed.
   * debian/rules: tweak GCC garbage collector on 32-bit MIPS builders.
   * debian/rules.d/tarball.mk: do a local bare clone before using git archive
     as it doesn't support https.
diff --git a/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff b/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
index 2ac7973..ce6eb95 100644
--- a/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
+++ b/debian/patches/hurd-i386/local-clock_gettime_MONOTONIC.diff
@@ -10,10 +10,10 @@ former.
  sysdeps/mach/hurd/bits/posix_opt.h |    2 +-
  sysdeps/unix/clock_gettime.c       |    1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
-Index: glibc-2.24/sysdeps/unix/clock_gettime.c
+Index: glibc-2.27/sysdeps/unix/clock_gettime.c
 ===================================================================
---- glibc-2.24.orig/sysdeps/unix/clock_gettime.c
-+++ glibc-2.24/sysdeps/unix/clock_gettime.c
+--- glibc-2.27.orig/sysdeps/unix/clock_gettime.c
++++ glibc-2.27/sysdeps/unix/clock_gettime.c
 @@ -101,6 +101,7 @@ __clock_gettime (clockid_t clock_id, str
  
  #ifndef HANDLED_REALTIME
@@ -21,11 +21,11 @@ Index: glibc-2.24/sysdeps/unix/clock_gettime.c
 +    case CLOCK_MONOTONIC:
        {
  	struct timeval tv;
- 	retval = gettimeofday (&tv, NULL);
-Index: glibc-2.24/sysdeps/posix/clock_getres.c
+ 	retval = __gettimeofday (&tv, NULL);
+Index: glibc-2.27/sysdeps/posix/clock_getres.c
 ===================================================================
---- glibc-2.24.orig/sysdeps/posix/clock_getres.c
-+++ glibc-2.24/sysdeps/posix/clock_getres.c
+--- glibc-2.27.orig/sysdeps/posix/clock_getres.c
++++ glibc-2.27/sysdeps/posix/clock_getres.c
 @@ -88,6 +88,7 @@ __clock_getres (clockid_t clock_id, stru
  
  #ifndef HANDLED_REALTIME
@@ -34,10 +34,10 @@ Index: glibc-2.24/sysdeps/posix/clock_getres.c
        retval = realtime_getres (res);
        break;
  #endif	/* handled REALTIME */
-Index: glibc-2.24/sysdeps/pthread/timer_create.c
+Index: glibc-2.27/sysdeps/pthread/timer_create.c
 ===================================================================
---- glibc-2.24.orig/sysdeps/pthread/timer_create.c
-+++ glibc-2.24/sysdeps/pthread/timer_create.c
+--- glibc-2.27.orig/sysdeps/pthread/timer_create.c
++++ glibc-2.27/sysdeps/pthread/timer_create.c
 @@ -48,7 +48,7 @@ timer_create (clockid_t clock_id, struct
        return -1;
      }
@@ -47,10 +47,10 @@ Index: glibc-2.24/sysdeps/pthread/timer_create.c
      {
        __set_errno (EINVAL);
        return -1;
-Index: glibc-2.24/sysdeps/mach/hurd/bits/posix_opt.h
+Index: glibc-2.27/sysdeps/mach/hurd/bits/posix_opt.h
 ===================================================================
---- glibc-2.24.orig/sysdeps/mach/hurd/bits/posix_opt.h
-+++ glibc-2.24/sysdeps/mach/hurd/bits/posix_opt.h
+--- glibc-2.27.orig/sysdeps/mach/hurd/bits/posix_opt.h
++++ glibc-2.27/sysdeps/mach/hurd/bits/posix_opt.h
 @@ -163,10 +163,10 @@
  #define _POSIX_THREAD_PROCESS_SHARED	-1
  
diff --git a/debian/patches/hurd-i386/submitted-net.diff b/debian/patches/hurd-i386/submitted-net.diff
index 0faefd0..b07434a 100644
--- a/debian/patches/hurd-i386/submitted-net.diff
+++ b/debian/patches/hurd-i386/submitted-net.diff
@@ -78,11 +78,11 @@ No topgit branch, TODO?
  sysdeps/unix/sysv/linux/netinet/if_ether.h |  105 ----------------
  20 files changed, 815 insertions(+), 1310 deletions(-)
 
-Index: eglibc-2.16/sysdeps/gnu/Makefile
+Index: glibc-2.27/sysdeps/gnu/Makefile
 ===================================================================
---- eglibc-2.16.orig/sysdeps/gnu/Makefile	2012-07-22 23:38:01.000000000 +0200
-+++ eglibc-2.16/sysdeps/gnu/Makefile	2012-07-23 00:21:13.000000000 +0200
-@@ -86,3 +86,8 @@
+--- glibc-2.27.orig/sysdeps/gnu/Makefile
++++ glibc-2.27/sysdeps/gnu/Makefile
+@@ -87,3 +87,8 @@ librt-sysdep_routines += rt-unwind-resum
  librt-shared-only-routines += rt-unwind-resume
  CFLAGS-rt-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
  endif
@@ -91,10 +91,10 @@ Index: eglibc-2.16/sysdeps/gnu/Makefile
 +sysdep_headers += net/ethernet.h net/if_arp.h net/if_ether.h \
 +		  net/route.h
 +endif
-Index: eglibc-2.16/sysdeps/gnu/net/ethernet.h
+Index: glibc-2.27/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
+--- /dev/null
++++ glibc-2.27/sysdeps/gnu/net/ethernet.h
 @@ -0,0 +1,84 @@
 +/* Copyright (C) 1997-2018 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -180,10 +180,10 @@ Index: eglibc-2.16/sysdeps/gnu/net/ethernet.h
 +__END_DECLS
 +
 +#endif	/* net/ethernet.h */
-Index: eglibc-2.16/sysdeps/gnu/net/if_arp.h
+Index: glibc-2.27/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
+--- /dev/null
++++ glibc-2.27/sysdeps/gnu/net/if_arp.h
 @@ -0,0 +1,183 @@
 +/* Definitions for Address Resolution Protocol.
 +   Copyright (C) 1997-2018 Free Software Foundation, Inc.
@@ -368,10 +368,10 @@ Index: eglibc-2.16/sysdeps/gnu/net/if_arp.h
 +__END_DECLS
 +
 +#endif	/* net/if_arp.h */
-Index: eglibc-2.16/sysdeps/gnu/net/if_ether.h
+Index: glibc-2.27/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
+--- /dev/null
++++ glibc-2.27/sysdeps/gnu/net/if_ether.h
 @@ -0,0 +1,115 @@
 +/* Copyright (C) 1997-2018 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -488,10 +488,10 @@ Index: eglibc-2.16/sysdeps/gnu/net/if_ether.h
 +} __attribute__((packed));
 +
 +#endif	/* net/if_ether.h */
-Index: eglibc-2.16/sysdeps/gnu/net/if_ppp.h
+Index: glibc-2.27/sysdeps/gnu/net/if_ppp.h
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ eglibc-2.16/sysdeps/gnu/net/if_ppp.h	2012-07-23 00:21:13.000000000 +0200
+--- /dev/null
++++ glibc-2.27/sysdeps/gnu/net/if_ppp.h
 @@ -0,0 +1,171 @@
 +/*	From: if_ppp.h,v 1.3 1995/06/12 11:36:50 paulus Exp */
 +
@@ -664,10 +664,10 @@ Index: eglibc-2.16/sysdeps/gnu/net/if_ppp.h
 +__END_DECLS
 +
 +#endif /* net/if_ppp.h */
-Index: eglibc-2.16/sysdeps/gnu/net/route.h
+Index: glibc-2.27/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
+--- /dev/null
++++ glibc-2.27/sysdeps/gnu/net/route.h
 @@ -0,0 +1,144 @@
 +/* Copyright (C) 1997-2018 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -813,10 +813,10 @@ Index: eglibc-2.16/sysdeps/gnu/net/route.h
 +#define RTMSG_AR_FAILED		0x51	/* Address Resolution failed.  */
 +
 +#endif /* net/route.h */
-Index: eglibc-2.16/sysdeps/gnu/netinet/if_ether.h
+Index: glibc-2.27/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
+--- /dev/null
++++ glibc-2.27/sysdeps/gnu/netinet/if_ether.h
 @@ -0,0 +1,103 @@
 +/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -921,11 +921,11 @@ Index: eglibc-2.16/sysdeps/gnu/netinet/if_ether.h
 +#endif /* __USE_MISC */
 +
 +#endif /* netinet/if_ether.h */
-Index: eglibc-2.16/sysdeps/mach/hurd/Makefile
+Index: glibc-2.27/sysdeps/mach/hurd/Makefile
 ===================================================================
---- eglibc-2.16.orig/sysdeps/mach/hurd/Makefile	2012-07-22 23:38:01.000000000 +0200
-+++ eglibc-2.16/sysdeps/mach/hurd/Makefile	2012-07-23 00:21:13.000000000 +0200
-@@ -199,9 +199,4 @@
+--- glibc-2.27.orig/sysdeps/mach/hurd/Makefile
++++ glibc-2.27/sysdeps/mach/hurd/Makefile
+@@ -202,11 +202,6 @@ ifeq ($(subdir),sunrpc)
  sysdep_headers += nfs/nfs.h
  endif
  
@@ -934,12 +934,14 @@ Index: eglibc-2.16/sysdeps/mach/hurd/Makefile
 -		  net/route.h
 -endif
 -
- endif	# in-Makerules
-Index: eglibc-2.16/sysdeps/mach/hurd/net/ethernet.h
+ ifeq ($(subdir),nis)
+ CFLAGS-ypclnt.c += -DUSE_BINDINGDIR=1
+ endif
+Index: glibc-2.27/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 @@
+--- glibc-2.27.orig/sysdeps/mach/hurd/net/ethernet.h
++++ /dev/null
+@@ -1,76 +0,0 @@
 -/* Copyright (C) 1997-2018 Free Software Foundation, Inc.
 -   This file is part of the GNU C Library.
 -
@@ -965,6 +967,7 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/ethernet.h
 -
 -#include <sys/cdefs.h>
 -#include <sys/types.h>
+-#include <stdint.h>
 -#include <net/if_ether.h>     /* IEEE 802.3 Ethernet constants */
 -
 -__BEGIN_DECLS
@@ -1015,11 +1018,11 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/ethernet.h
 -__END_DECLS
 -
 -#endif /* net/ethernet.h */
-Index: eglibc-2.16/sysdeps/mach/hurd/net/if_arp.h
+Index: glibc-2.27/sysdeps/mach/hurd/net/if_arp.h
 ===================================================================
---- eglibc-2.16.orig/sysdeps/mach/hurd/net/if_arp.h	2012-02-18 03:24:59.000000000 +0100
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,144 +0,0 @@
+--- glibc-2.27.orig/sysdeps/mach/hurd/net/if_arp.h
++++ /dev/null
+@@ -1,145 +0,0 @@
 -/* Definitions for Address Resolution Protocol.
 -   Copyright (C) 1997-2018 Free Software Foundation, Inc.
 -   This file is part of the GNU C Library.
@@ -1048,6 +1051,7 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/if_arp.h
 -
 -#include <sys/types.h>
 -#include <sys/socket.h>
+-#include <stdint.h>
 -
 -__BEGIN_DECLS
 -
@@ -1164,10 +1168,10 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/if_arp.h
 -__END_DECLS
 -
 -#endif	/* net/if_arp.h */
-Index: eglibc-2.16/sysdeps/mach/hurd/net/if_ether.h
+Index: glibc-2.27/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
+--- glibc-2.27.orig/sysdeps/mach/hurd/net/if_ether.h
++++ /dev/null
 @@ -1,84 +0,0 @@
 -/* Copyright (C) 1997-2018 Free Software Foundation, Inc.
 -   This file is part of the GNU C Library.
@@ -1253,11 +1257,11 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/if_ether.h
 -};
 -
 -#endif	/* net/if_ether.h */
-Index: eglibc-2.16/sysdeps/mach/hurd/net/if_ppp.h
+Index: glibc-2.27/sysdeps/mach/hurd/net/if_ppp.h
 ===================================================================
---- eglibc-2.16.orig/sysdeps/mach/hurd/net/if_ppp.h	2006-08-17 03:18:26.000000000 +0200
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,172 +0,0 @@
+--- glibc-2.27.orig/sysdeps/mach/hurd/net/if_ppp.h
++++ /dev/null
+@@ -1,171 +0,0 @@
 -/*	From: if_ppp.h,v 1.3 1995/06/12 11:36:50 paulus Exp */
 -
 -/*
@@ -1313,7 +1317,6 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/if_ppp.h
 -
 -#include <net/if.h>
 -#include <sys/ioctl.h>
--#include <net/ppp_defs.h>
 -
 -__BEGIN_DECLS
 -
@@ -1430,10 +1433,10 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/if_ppp.h
 -__END_DECLS
 -
 -#endif /* net/if_ppp.h */
-Index: eglibc-2.16/sysdeps/mach/hurd/net/route.h
+Index: glibc-2.27/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
+--- glibc-2.27.orig/sysdeps/mach/hurd/net/route.h
++++ /dev/null
 @@ -1,140 +0,0 @@
 -/* Copyright (C) 1997-2018 Free Software Foundation, Inc..
 -   This file is part of the GNU C Library.
@@ -1575,11 +1578,11 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/route.h
 -#define RTMSG_AR_FAILED		0x51	/* Address Resolution failed.  */
 -
 -#endif /* net/route.h */
-Index: eglibc-2.16/sysdeps/unix/sysv/linux/Makefile
+Index: glibc-2.27/sysdeps/unix/sysv/linux/Makefile
 ===================================================================
---- eglibc-2.16.orig/sysdeps/unix/sysv/linux/Makefile	2012-06-01 15:59:14.000000000 +0200
-+++ eglibc-2.16/sysdeps/unix/sysv/linux/Makefile	2012-07-23 00:21:13.000000000 +0200
-@@ -117,8 +117,7 @@
+--- glibc-2.27.orig/sysdeps/unix/sysv/linux/Makefile
++++ glibc-2.27/sysdeps/unix/sysv/linux/Makefile
+@@ -118,8 +118,7 @@ $(objpfx)tst-signal-numbers.out: \
  endif
  
  ifeq ($(subdir),socket)
@@ -1588,11 +1591,11 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/Makefile
 +sysdep_headers += net/ppp-comp.h net/ppp_defs.h \
  		  net/if_slip.h net/if_packet.h net/if_shaper.h
  sysdep_routines += cmsg_nxthdr
- endif
-Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/ethernet.h
+ CFLAGS-recvmmsg.c = -fexceptions -fasynchronous-unwind-tables
+Index: glibc-2.27/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
+--- glibc-2.27.orig/sysdeps/unix/sysv/linux/net/ethernet.h
++++ /dev/null
 @@ -1,84 +0,0 @@
 -/* Copyright (C) 1997-2018 Free Software Foundation, Inc.
 -   This file is part of the GNU C Library.
@@ -1678,10 +1681,10 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/ethernet.h
 -__END_DECLS
 -
 -#endif	/* net/ethernet.h */
-Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/if_arp.h
+Index: glibc-2.27/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
+--- glibc-2.27.orig/sysdeps/unix/sysv/linux/net/if_arp.h
++++ /dev/null
 @@ -1,183 +0,0 @@
 -/* Definitions for Address Resolution Protocol.
 -   Copyright (C) 1997-2018 Free Software Foundation, Inc.
@@ -1866,10 +1869,10 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/if_arp.h
 -__END_DECLS
 -
 -#endif	/* net/if_arp.h */
-Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/if_ether.h
+Index: glibc-2.27/sysdeps/unix/sysv/linux/net/if_ether.h
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ eglibc-2.16/sysdeps/unix/sysv/linux/net/if_ether.h	2012-07-23 00:21:13.000000000 +0200
+--- /dev/null
++++ glibc-2.27/sysdeps/unix/sysv/linux/net/if_ether.h
 @@ -0,0 +1,7 @@
 +#ifndef _NET_IF_ETHER_H
 +#define _NET_IF_ETHER_H 1
@@ -1878,10 +1881,10 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/if_ether.h
 +#include <linux/if_ether.h>
 +
 +#endif /* net/if_ether.h */
-Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/if_ppp.h
+Index: glibc-2.27/sysdeps/unix/sysv/linux/net/if_ppp.h
 ===================================================================
---- eglibc-2.16.orig/sysdeps/unix/sysv/linux/net/if_ppp.h	2006-08-17 03:18:26.000000000 +0200
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+--- glibc-2.27.orig/sysdeps/unix/sysv/linux/net/if_ppp.h
++++ /dev/null
 @@ -1,171 +0,0 @@
 -/*	From: if_ppp.h,v 1.3 1995/06/12 11:36:50 paulus Exp */
 -
@@ -2054,10 +2057,10 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/if_ppp.h
 -__END_DECLS
 -
 -#endif /* net/if_ppp.h */
-Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/route.h
+Index: glibc-2.27/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
+--- glibc-2.27.orig/sysdeps/unix/sysv/linux/net/route.h
++++ /dev/null
 @@ -1,144 +0,0 @@
 -/* Copyright (C) 1997-2018 Free Software Foundation, Inc.
 -   This file is part of the GNU C Library.
@@ -2203,10 +2206,10 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/route.h
 -#define RTMSG_AR_FAILED		0x51	/* Address Resolution failed.  */
 -
 -#endif /* net/route.h */
-Index: eglibc-2.16/sysdeps/unix/sysv/linux/netinet/if_ether.h
+Index: glibc-2.27/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
+--- glibc-2.27.orig/sysdeps/unix/sysv/linux/netinet/if_ether.h
++++ /dev/null
 @@ -1,104 +0,0 @@
 -/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
 -   This file is part of the GNU C Library.
diff --git a/debian/patches/hurd-i386/tg-fcntl-internal.h.diff b/debian/patches/hurd-i386/tg-fcntl-internal.h.diff
deleted file mode 100644
index 72bce9c..0000000
--- a/debian/patches/hurd-i386/tg-fcntl-internal.h.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Thomas Schwinge <thomas@schwinge.name>
-Subject: [PATCH] fcntl-internal.h
-
-2008-12-18  Thomas Schwinge  <tschwinge@gnu.org>
-
-	* hurd/fcntl-internal.h: New file.
-
----
- hurd/fcntl-internal.h |   60 +++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 60 insertions(+)
-
-diff --git a/hurd/fcntl-internal.h b/hurd/fcntl-internal.h
-new file mode 100644
-index 0000000..c816b37
---- /dev/null
-+++ b/hurd/fcntl-internal.h
-@@ -0,0 +1,60 @@
-+/* Copyright (C) 2008 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
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+
-+#include <fcntl.h>
-+#include <sys/socket.h>
-+#include <verify.h>
-+
-+/* Do some compile-time checks for the SOCK_* constants, which we rely on.  */
-+verify (SOCK_CLOEXEC == O_CLOEXEC);
-+verify ((SOCK_MAX | SOCK_TYPE_MASK) == SOCK_TYPE_MASK);
-+verify ((SOCK_CLOEXEC & SOCK_TYPE_MASK) == 0);
-+verify ((SOCK_NONBLOCK & SOCK_TYPE_MASK) == 0);
-+
-+
-+/* Helper functions for translating between O_* and SOCK_* flags.  */
-+
-+__extern_always_inline
-+int
-+sock_to_o_flags (int in)
-+{
-+  int out = 0;
-+
-+  if (in & SOCK_NONBLOCK)
-+    out |= O_NONBLOCK;
-+  /* Others are passed through unfiltered.  */
-+  out |= in & ~(SOCK_NONBLOCK);
-+
-+  return out;
-+}
-+
-+__extern_always_inline
-+int
-+o_to_sock_flags (int in)
-+{
-+  int out = 0;
-+
-+  if (in & O_NONBLOCK)
-+    out |= SOCK_NONBLOCK;
-+  /* Others are passed through unfiltered.  */
-+  out |= in & ~(O_NONBLOCK);
-+
-+  return out;
-+}
--- 
-tg: (2741836..) t/fcntl-internal.h (depends on: t/verify.h t/bits_socket.h)
diff --git a/debian/patches/hurd-i386/tg-pagesize.diff b/debian/patches/hurd-i386/tg-pagesize.diff
index 7255cf5..b96269f 100644
--- a/debian/patches/hurd-i386/tg-pagesize.diff
+++ b/debian/patches/hurd-i386/tg-pagesize.diff
@@ -9,9 +9,11 @@ WIP.  id:"87mxd9hl2n.fsf@kepler.schwinge.homeip.net"
  elf/rtld.c       |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
---- a/elf/dl-support.c
-+++ b/elf/dl-support.c
-@@ -145,7 +145,7 @@ hp_timing_t _dl_cpuclock_offset;
+Index: glibc-2.27/elf/dl-support.c
+===================================================================
+--- glibc-2.27.orig/elf/dl-support.c
++++ glibc-2.27/elf/dl-support.c
+@@ -136,7 +136,7 @@ hp_timing_t _dl_cpuclock_offset;
  
  void (*_dl_init_static_tls) (struct link_map *) = &_dl_nothread_init_static_tls;
  
@@ -20,10 +22,12 @@ WIP.  id:"87mxd9hl2n.fsf@kepler.schwinge.homeip.net"
  
  int _dl_inhibit_cache;
  
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -164,7 +164,7 @@ struct rtld_global_ro _rtld_global_ro at
-     ._dl_hwcap_mask = HWCAP_IMPORTANT,
+Index: glibc-2.27/elf/rtld.c
+===================================================================
+--- glibc-2.27.orig/elf/rtld.c
++++ glibc-2.27/elf/rtld.c
+@@ -271,7 +271,7 @@ struct rtld_global_ro _rtld_global_ro at
+ #endif
      ._dl_lazy = 1,
      ._dl_fpu_control = _FPU_DEFAULT,
 -    ._dl_pagesize = EXEC_PAGESIZE,
diff --git a/debian/patches/series.hurd-i386 b/debian/patches/series.hurd-i386
index 94f39a9..7a55e23 100644
--- a/debian/patches/series.hurd-i386
+++ b/debian/patches/series.hurd-i386
@@ -6,7 +6,6 @@ hurd-i386/local-clock_gettime_MONOTONIC.diff
 hurd-i386/submitted-AF_LINK.diff
 hurd-i386/unsubmitted-mremap.diff
 hurd-i386/tg-verify.h.diff
-hurd-i386/tg-fcntl-internal.h.diff
 hurd-i386/tg-pagesize.diff
 hurd-i386/local-no-bootstrap-fs-access.diff
 hurd-i386/tg-timer_routines.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to:
References:
- [glibc] branch glibc-2.27 updated (b54b042 -> 555e8eb)
  - From: Aurelien Jarno <aurel32@moszumanska.debian.org>
Prev by Date: [glibc] branch glibc-2.27 updated (71ea7c8 -> b54b042)
Next by Date: [Git][glibc-team/glibc-doc-reference][sid] 2 commits: Update to standards-version 4.1.3.
Previous by thread: [glibc] branch glibc-2.27 updated (b54b042 -> 555e8eb)
Next by thread: [Git][glibc-team/glibc-doc-reference] Pushed new tag debian/2.26-2
Index(es):
- Date
- Thread