[glibc] 01/01: patches/any/submitted-if.h-conflict.diff: new patch to fix the conflict between <linux/if.h> and <net/if.h>. Closes: #824442.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit b891546d948f797c034a9ac49f07a4faf1426025
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Apr 9 22:17:07 2017 +0200
patches/any/submitted-if.h-conflict.diff: new patch to fix the conflict between <linux/if.h> and <net/if.h>. Closes: #824442.
---
debian/changelog | 2 +
debian/patches/any/submitted-if.h-conflict.diff | 74 +++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 77 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 909783e..30f41e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ glibc (2.24-10) UNRELEASED; urgency=medium
regressions when building a +debXuX version. That way changes in the
environment (e.g.: kernel) do not prevent security or stable versions
to be built.
+ * patches/any/submitted-if.h-conflict.diff: new patch to fix the conflict
+ between <linux/if.h> and <net/if.h>. Closes: #824442.
-- Aurelien Jarno <aurel32@debian.org> Mon, 16 Jan 2017 18:46:54 +0100
diff --git a/debian/patches/any/submitted-if.h-conflict.diff b/debian/patches/any/submitted-if.h-conflict.diff
new file mode 100644
index 0000000..d9c7de4
--- /dev/null
+++ b/debian/patches/any/submitted-if.h-conflict.diff
@@ -0,0 +1,74 @@
+2017-04-09 Aurelien Jarno <aurelien@aurel32.net>
+
+ [BZ #21367]
+ * sysdeps/gnu/net/if.h: wrap IFF_* enums in
+ !defined __UAPI_DEF_IF_NET_DEVICE_FLAGS defines.
+ (struct ifmap): Wrap in !defined __UAPI_DEF_IF_IFMAP defines.
+ (struct ifreq): Wrap in !defined __UAPI_DEF_IF_IFREQ defines.
+ (struct ifconf): Wrap in !defined __UAPI_DEF_IF_IFCONF defines.
+
+--- a/sysdeps/gnu/net/if.h
++++ b/sysdeps/gnu/net/if.h
+@@ -39,6 +39,7 @@ struct if_nameindex
+
+ #ifdef __USE_MISC
+ /* Standard interface flags. */
++# ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS
+ enum
+ {
+ IFF_UP = 0x1, /* Interface is up. */
+@@ -79,6 +80,7 @@ enum
+ IFF_DYNAMIC = 0x8000 /* Dialup device with changing addresses. */
+ # define IFF_DYNAMIC IFF_DYNAMIC
+ };
++# endif /* !defined __UAPI_DEF_IF_NET_DEVICE_FLAGS */
+
+ /* The ifaddr structure contains information about one address of an
+ interface. They are maintained by the different address families,
+@@ -108,6 +110,7 @@ struct ifaddr
+ handy for debugging things. The set side is fine for now and being
+ very small might be worth keeping for clean configuration. */
+
++# ifndef __UAPI_DEF_IF_IFMAP
+ struct ifmap
+ {
+ unsigned long int mem_start;
+@@ -118,11 +121,13 @@ struct ifmap
+ unsigned char port;
+ /* 3 bytes spare */
+ };
++# endif /* !defined __UAPI_DEF_IF_IFMAP */
+
+ /* Interface request structure used for socket ioctl's. All interface
+ ioctl's must have parameter definitions which begin with ifr_name.
+ The remainder may be interface specific. */
+
++# ifndef __UAPI_DEF_IF_IFREQ
+ struct ifreq
+ {
+ # define IFHWADDRLEN 6
+@@ -148,6 +153,8 @@ struct ifreq
+ __caddr_t ifru_data;
+ } ifr_ifru;
+ };
++# endif /* !__UAPI_DEF_IF_IFREQ */
++
+ # define ifr_name ifr_ifrn.ifrn_name /* interface name */
+ # define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */
+ # define ifr_addr ifr_ifru.ifru_addr /* address */
+@@ -173,6 +180,7 @@ struct ifreq
+ configuration for machine (useful for programs which must know all
+ networks accessible). */
+
++# ifndef __UAPI_DEF_IF_IFCONF
+ struct ifconf
+ {
+ int ifc_len; /* Size of buffer. */
+@@ -182,6 +190,7 @@ struct ifconf
+ struct ifreq *ifcu_req;
+ } ifc_ifcu;
+ };
++# endif /* !defined __UAPI_DEF_IF_IFCONF */
+ # define ifc_buf ifc_ifcu.ifcu_buf /* Buffer address. */
+ # define ifc_req ifc_ifcu.ifcu_req /* Array of structures. */
+ # define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) /* not right */
diff --git a/debian/patches/series b/debian/patches/series
index 16e7df0..0aebc6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -218,3 +218,4 @@ any/submitted-dlopen-noload.diff
any/submitted-perl-inc.diff
any/submitted-unicode-9.0.0.diff
any/cvs-remove-pid-tid-cache-clone.diff
+any/submitted-if.h-conflict.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: