CVS commit: pkgsrc/textproc/xmlrpc-c

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Wed Dec 18 12:43:40 UTC 2019

Modified Files:
        pkgsrc/textproc/xmlrpc-c: distinfo
Added Files:
        pkgsrc/textproc/xmlrpc-c/patches: patch-test_cpp_server__abyss.cpp

Log Message:
Resolve conflict with STL.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/textproc/xmlrpc-c/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/xmlrpc-c/patches/patch-test_cpp_server__abyss.cpp

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

Modified files:

Index: pkgsrc/textproc/xmlrpc-c/distinfo
diff -u pkgsrc/textproc/xmlrpc-c/distinfo:1.35 pkgsrc/textproc/xmlrpc-c/distinfo:1.36
--- pkgsrc/textproc/xmlrpc-c/distinfo:1.35      Tue Oct 29 09:06:12 2019
+++ pkgsrc/textproc/xmlrpc-c/distinfo   Wed Dec 18 12:43:40 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2019/10/29 09:06:12 he Exp $
+$NetBSD: distinfo,v 1.36 2019/12/18 12:43:40 joerg Exp $
 
 SHA1 (xmlrpc-c-1.51.04.tgz) = 0c085e210d07b2e2d8ce877e24c370a7b3df2074
 RMD160 (xmlrpc-c-1.51.04.tgz) = c85a1ec7bdf5bb4a49b8d0445b7ab1a94b53bd66
@@ -8,6 +8,7 @@ SHA1 (patch-GNUmakefile) = eb669cc4d9290
 SHA1 (patch-common.mk) = c11a9a69b45d28d79b2baac681a6e3c077664683
 SHA1 (patch-config.mk.in) = 0456837827c71824aa39914086e466a494038dc8
 SHA1 (patch-src_cpp_server__pstream.cpp) = 0b28182c56bb326bf24ac031874521b1bb6d5ef5
+SHA1 (patch-test_cpp_server__abyss.cpp) = 587375211ebe732caf101f5d076d5ca3149f5ded
 SHA1 (patch-tools_xml-rpc-api2cpp_Makefile) = 6b6b3f24a247856d61284cdbb4ecc21eb436d3a0
 SHA1 (patch-tools_xmlrpc_Makefile) = 92428282885a2b66ce89d629a0a7a9167715a334
 SHA1 (patch-tools_xmlrpc__transport_Makefile) = a5fd2fd98acceae4832d0dbfc9849f16401975e4

Added files:

Index: pkgsrc/textproc/xmlrpc-c/patches/patch-test_cpp_server__abyss.cpp
diff -u /dev/null pkgsrc/textproc/xmlrpc-c/patches/patch-test_cpp_server__abyss.cpp:1.1
--- /dev/null   Wed Dec 18 12:43:40 2019
+++ pkgsrc/textproc/xmlrpc-c/patches/patch-test_cpp_server__abyss.cpp   Wed Dec 18 12:43:40 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-test_cpp_server__abyss.cpp,v 1.1 2019/12/18 12:43:40 joerg Exp $
+
+The socket function, not the generic function call STL method.
+
+--- test/cpp/server_abyss.cpp.orig     2019-12-17 01:07:01.776470052 +0000
++++ test/cpp/server_abyss.cpp
+@@ -85,7 +85,7 @@ public:
+         sockAddr.sin_port   = htons(portNumber);
+         sockAddr.sin_addr.s_addr = 0;
+ 
+-        rc = bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
++        rc = ::bind(this->fd, (struct sockaddr *)&sockAddr, sizeof(sockAddr));
+         
+         if (rc != 0) {
+             closesock(this->fd);