[pkgsrc/pkgsrc-2017Q3]: pkgsrc/lang/tcl Pullup ticket #5562 - requested by taca

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5f7065c712ca
branches:  pkgsrc-2017Q3
changeset: 408517:5f7065c712ca
user:      spz <spz%pkgsrc.org@localhost>
date:      Wed Oct 04 16:07:20 2017 +0000

description:
Pullup ticket #5562 - requested by taca
lang/tcl: build fix

Revisions pulled up:
- lang/tcl/distinfo                                             1.75
- lang/tcl/patches/patch-unix_tclUnixSock.c                     1.1

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Wed Sep 27 02:53:43 UTC 2017

   Modified Files:
        pkgsrc/lang/tcl: distinfo
   Added Files:
        pkgsrc/lang/tcl/patches: patch-unix_tclUnixSock.c

   Log Message:
   lang/tcl: build fix on NetBSD 6

   Build fix on NetBSD 6 applying upstream update.


   To generate a diff of this commit:
   cvs rdiff -u -r1.74 -r1.75 pkgsrc/lang/tcl/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/lang/tcl/patches/patch-unix_tclUnixSock.c

diffstat:

 lang/tcl/distinfo                         |   3 +-
 lang/tcl/patches/patch-unix_tclUnixSock.c |  34 +++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletions(-)

diffs (52 lines):

diff -r 66c65ddb2f7b -r 5f7065c712ca lang/tcl/distinfo
--- a/lang/tcl/distinfo Wed Oct 04 15:41:50 2017 +0000
+++ b/lang/tcl/distinfo Wed Oct 04 16:07:20 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.74 2017/08/25 11:05:33 adam Exp $
+$NetBSD: distinfo,v 1.74.4.1 2017/10/04 16:07:20 spz Exp $
 
 SHA1 (tcl8.6.7-src.tar.gz) = 68934c6ecf827348085e0f06c7396b31fb539d83
 RMD160 (tcl8.6.7-src.tar.gz) = 5f114bbd95c7208f929fe9ddb3432636d376844c
@@ -24,3 +24,4 @@
 SHA1 (patch-unix_tclUnixFCmd.c) = e715d9419a36a8414355252bb3da0ef48b07fe4f
 SHA1 (patch-unix_tclUnixInit.c) = 50eafafdd10e35266f9fe5b73a80e7b50f393f88
 SHA1 (patch-unix_tclUnixPort.h) = f7d2e7b8912b9bff1709ac2c34aee1f4725e90ac
+SHA1 (patch-unix_tclUnixSock.c) = 77c09de2786ec5f8c4a5ab4004acf5172fa1fe3b
diff -r 66c65ddb2f7b -r 5f7065c712ca lang/tcl/patches/patch-unix_tclUnixSock.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/tcl/patches/patch-unix_tclUnixSock.c Wed Oct 04 16:07:20 2017 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-unix_tclUnixSock.c,v 1.1.2.2 2017/10/04 16:07:20 spz Exp $
+
+* Move pragmas to make gcc happy;
+  http://core.tcl.tk/tcl/vinfo/dce77b1b201e9329
+
+--- unix/tclUnixSock.c.orig    2017-04-28 18:05:52.000000000 +0000
++++ unix/tclUnixSock.c
+@@ -700,6 +700,8 @@ TcpClose2Proc(
+  */
+ 
+ #ifndef NEED_FAKE_RFC2553
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+ static inline int
+ IPv6AddressNeedsNumericRendering(
+     struct in6_addr addr)
+@@ -713,16 +715,14 @@ IPv6AddressNeedsNumericRendering(
+      * at least some versions of OSX.
+      */
+ 
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+     if (!IN6_IS_ADDR_V4MAPPED(&addr)) {
+-#pragma GCC diagnostic pop
+         return 0;
+     }
+ 
+     return (addr.s6_addr[12] == 0 && addr.s6_addr[13] == 0
+             && addr.s6_addr[14] == 0 && addr.s6_addr[15] == 0);
+ }
++#pragma GCC diagnostic pop
+ #endif /* NEED_FAKE_RFC2553 */
+ 
+ static void