components/x11/xtrans/patches/01-inetv6.patch

   1 /*
   2  * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
   3  *
   4  * Permission is hereby granted, free of charge, to any person obtaining a
   5  * copy of this software and associated documentation files (the "Software"),
   6  * to deal in the Software without restriction, including without limitation
   7  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
   8  * and/or sell copies of the Software, and to permit persons to whom the
   9  * Software is furnished to do so, subject to the following conditions:
  10  *
  11  * The above copyright notice and this permission notice (including the next
  12  * paragraph) shall be included in all copies or substantial portions of the
  13  * Software.
  14  *
  15  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  16  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  17  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  18  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  19  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  20  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  21  * DEALINGS IN THE SOFTWARE.
  22  *
  23  */
  24
  25 Solaris 9 shipped with IPv6 support based on the X.Org draft standard, which
  26 used "inetv6" - the final standard renamed it to "inet6", but since we already
  27 shipped, we retain the old name for backwards compatibility.
  28 (See PSARC 2004/285.)
  29
  30 diff --git a/Xtranssock.c b/Xtranssock.c
  31 index dfa41cf..8c11b9d 100644
  32 --- a/Xtranssock.c
  33 +++ b/Xtranssock.c
  34 @@ -188,6 +188,9 @@ static Sockettrans2dev Sockettrans2devtab[] = {
  35      {"tcp",AF_INET6,SOCK_STREAM,SOCK_DGRAM,0},
  36      {"tcp",AF_INET,SOCK_STREAM,SOCK_DGRAM,0}, /* fallback */
  37      {"inet6",AF_INET6,SOCK_STREAM,SOCK_DGRAM,0},
  38 +#ifdef SUNSOFT /* Backwards compatibility with Solaris 9 */
  39 +    {"inetv6",AF_INET6,SOCK_STREAM,SOCK_DGRAM,0},
  40 +#endif
  41  #endif
  42  #endif /* TCPCONN */
  43  #ifdef UNIXCONN