diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-08-17 13:34:18 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-08-17 13:34:18 +0400 |
| commit | f99d413b24f978659ca1427f75996bd00a2f756d (patch) | |
| tree | 6baa5fe3cc2199016eac1fe3238502bf8e4cd76b /uts | |
| parent | 1cf7b9ed72aeb18b4a08a9b18f89d0c364bcff2f (diff) | |
| download | illumos-packaging-f99d413b24f978659ca1427f75996bd00a2f756d.tar.gz | |
Added msghdr-xpg42.patch
Diffstat (limited to 'uts')
| -rw-r--r-- | uts/debian/changelog | 1 | ||||
| -rw-r--r-- | uts/debian/patches/msghdr-xpg42.patch | 56 | ||||
| -rw-r--r-- | uts/debian/patches/series | 1 |
3 files changed, 58 insertions, 0 deletions
diff --git a/uts/debian/changelog b/uts/debian/changelog index 09c407f..aaaf86a 100644 --- a/uts/debian/changelog +++ b/uts/debian/changelog @@ -2,6 +2,7 @@ uts (2.10-5) UNRELEASED; urgency=low * Don't ship usr/include/sys/iscsit/iscsit_common.h * Install usr/include/sys/videodev2.h to usr/include/linux/ + * Added msghdr-xpg42.patch -- Igor Pashev <pashev.igor@gmail.com> Fri, 17 May 2013 00:18:17 +0400 diff --git a/uts/debian/patches/msghdr-xpg42.patch b/uts/debian/patches/msghdr-xpg42.patch new file mode 100644 index 0000000..caca2c1 --- /dev/null +++ b/uts/debian/patches/msghdr-xpg42.patch @@ -0,0 +1,56 @@ +Index: uts/usr/src/uts/common/sys/socket.h +=================================================================== +--- uts.orig/usr/src/uts/common/sys/socket.h 2012-10-08 04:26:00.000000000 +0400 ++++ uts/usr/src/uts/common/sys/socket.h 2013-08-17 13:32:19.245224087 +0400 +@@ -338,15 +338,9 @@ + socklen_t msg_namelen; /* size of address */ + struct iovec *msg_iov; /* scatter/gather array */ + int msg_iovlen; /* # elements in msg_iov */ +- +-#if defined(_XPG4_2) || defined(_KERNEL) + void *msg_control; /* ancillary data */ + socklen_t msg_controllen; /* ancillary data buffer len */ + int msg_flags; /* flags on received message */ +-#else +- caddr_t msg_accrights; /* access rights sent/received */ +- int msg_accrightslen; +-#endif /* defined(_XPG4_2) || defined(_KERNEL) */ + }; + + #if defined(_KERNEL) +@@ -433,7 +427,6 @@ + int cmsg_type; /* protocol-specific type */ + }; + +-#if defined(_XPG4_2) || defined(_KERNEL) + #if defined(__sparc) + /* To maintain backward compatibility, alignment needs to be 8 on sparc. */ + #define _CMSG_HDR_ALIGNMENT 8 +@@ -441,9 +434,7 @@ + /* for __i386 (and other future architectures) */ + #define _CMSG_HDR_ALIGNMENT 4 + #endif /* defined(__sparc) */ +-#endif /* defined(_XPG4_2) || defined(_KERNEL) */ + +-#if defined(_XPG4_2) + /* + * The cmsg headers (and macros dealing with them) were made available as + * part of UNIX95 and hence need to be protected with a _XPG4_2 define. +@@ -478,9 +469,7 @@ + #define CMSG_LEN(l) \ + ((unsigned int)_CMSG_DATA_ALIGN(sizeof (struct cmsghdr)) + (l)) + +-#endif /* _XPG4_2 */ + +-#ifdef _XPG4_2 + #ifdef __PRAGMA_REDEFINE_EXTNAME + #pragma redefine_extname bind __xnet_bind + #pragma redefine_extname connect __xnet_connect +@@ -501,7 +490,6 @@ + #define getsockopt __xnet_getsockopt + #endif /* __PRAGMA_REDEFINE_EXTNAME */ + +-#endif /* _XPG4_2 */ + + #if defined(_XPG4_2) && !defined(_XPG5) + #ifdef __PRAGMA_REDEFINE_EXTNAME diff --git a/uts/debian/patches/series b/uts/debian/patches/series index 0568303..8d0503a 100644 --- a/uts/debian/patches/series +++ b/uts/debian/patches/series @@ -69,3 +69,4 @@ boolean_t-guard.patch sys_types.h-includes-features.h.patch illumos-3665-O_CLOEXEC.patch illumos-3667-ixgbe-unsupported-SFP-modules.patch +msghdr-xpg42.patch |