CVS commit: [pkgsrc-2017Q1] pkgsrc/lang/basic256

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Jun 21 18:55:38 UTC 2017

Modified Files:
        pkgsrc/lang/basic256 [pkgsrc-2017Q1]: distinfo
        pkgsrc/lang/basic256/patches [pkgsrc-2017Q1]: patch-Interpreter.cpp

Log Message:
Pullup ticket #5485 - requested by sevan
lang/basic256: bugfix

Revisions pulled up:
- lang/basic256/distinfo                                        1.7
- lang/basic256/patches/patch-Interpreter.cpp                   1.3

---
   Module Name:    pkgsrc
   Committed By:   joerg
   Date:           Sat Jun 17 19:42:58 UTC 2017

   Modified Files:
           pkgsrc/lang/basic256: distinfo
           pkgsrc/lang/basic256/patches: patch-Interpreter.cpp

   Log Message:
   Fix portability.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.10.1 pkgsrc/lang/basic256/distinfo
cvs rdiff -u -r1.2 -r1.2.16.1 \
    pkgsrc/lang/basic256/patches/patch-Interpreter.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/basic256/distinfo
diff -u pkgsrc/lang/basic256/distinfo:1.6 pkgsrc/lang/basic256/distinfo:1.6.10.1
--- pkgsrc/lang/basic256/distinfo:1.6   Tue Dec 29 23:34:43 2015
+++ pkgsrc/lang/basic256/distinfo       Wed Jun 21 18:55:38 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2015/12/29 23:34:43 dholland Exp $
+$NetBSD: distinfo,v 1.6.10.1 2017/06/21 18:55:38 bsiegert Exp $
 
 SHA1 (basic256_0.9.6.71.tgz) = 3a8ee26230d5b14b5f325c3b6e0db511534d785f
 RMD160 (basic256_0.9.6.71.tgz) = 1edd4a2eb153eb9712f8b33e1ff2a64ebf1ba883
 SHA512 (basic256_0.9.6.71.tgz) = cdebc9da6b3835c7b626e0cf1c90019c6cf5091f43e7f17923b03392eac9013d70817fd60fda705ccb8843ea7d649e30eb8ef50593da39e4a75b1b15c4279f21
 Size (basic256_0.9.6.71.tgz) = 7924162 bytes
-SHA1 (patch-Interpreter.cpp) = 23e0c4d7b611dff4366dbd6859d8c4eddf9d31ad
+SHA1 (patch-Interpreter.cpp) = 1b2cbe8ca0b696f932f231e44716d104156ad633
 SHA1 (patch-RunController.cpp) = 7716844575a393900b9cab1e61abd6b18cf5b138
 SHA1 (patch-Variables.h) = a3e777c774c57103506d09e8300867766c2067fd

Index: pkgsrc/lang/basic256/patches/patch-Interpreter.cpp
diff -u pkgsrc/lang/basic256/patches/patch-Interpreter.cpp:1.2 pkgsrc/lang/basic256/patches/patch-Interpreter.cpp:1.2.16.1
--- pkgsrc/lang/basic256/patches/patch-Interpreter.cpp:1.2      Wed Jun 10 14:58:50 2015
+++ pkgsrc/lang/basic256/patches/patch-Interpreter.cpp  Wed Jun 21 18:55:38 2017
@@ -1,6 +1,8 @@
-$NetBSD: patch-Interpreter.cpp,v 1.2 2015/06/10 14:58:50 joerg Exp $
+$NetBSD: patch-Interpreter.cpp,v 1.2.16.1 2017/06/21 18:55:38 bsiegert Exp $
 
 Avoid overlap with std::mutex.
+Fix delete use.
+Avoid overlap between std::bind and bind(2).
 
 --- Interpreter.cpp.orig       2012-08-06 14:57:58.000000000 +0000
 +++ Interpreter.cpp
@@ -49,3 +51,12 @@ Avoid overlap with std::mutex.
                                }
                        }
                }
+@@ -3400,7 +3402,7 @@ Interpreter::execByteCode()
+                                                               serv_addr.sin_family = AF_INET;
+                                                               serv_addr.sin_addr.s_addr = INADDR_ANY;
+                                                               serv_addr.sin_port = htons(port);
+-                                                              if (bind(tempsockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
++                                                              if (::bind(tempsockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
+                                                                       errornum = ERROR_NETBIND;
+                                                                       errormessage = strerror(errno);
+                                                                       tempsockfd = netSockClose(tempsockfd);