CVS commit: pkgsrc/net/ftplibpp

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Mar 26 02:30:27 UTC 2020

Modified Files:
        pkgsrc/net/ftplibpp: distinfo
Added Files:
        pkgsrc/net/ftplibpp/patches: patch-ftplib.cpp

Log Message:
Fix <functional> vs BSD socket conflict


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/ftplibpp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ftplibpp/patches/patch-ftplib.cpp

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

Modified files:

Index: pkgsrc/net/ftplibpp/distinfo
diff -u pkgsrc/net/ftplibpp/distinfo:1.4 pkgsrc/net/ftplibpp/distinfo:1.5
--- pkgsrc/net/ftplibpp/distinfo:1.4    Wed Nov  4 00:35:01 2015
+++ pkgsrc/net/ftplibpp/distinfo        Thu Mar 26 02:30:26 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 00:35:01 agc Exp $
+$NetBSD: distinfo,v 1.5 2020/03/26 02:30:26 joerg Exp $
 
 SHA1 (ftplibpp-1.0.1.tar.gz) = 51bfa48cf54efd23becdc83eb0f5d16f3e7bec21
 RMD160 (ftplibpp-1.0.1.tar.gz) = 6ea80510ba4aace8cf73474ab2bcb9373d799070
 SHA512 (ftplibpp-1.0.1.tar.gz) = e613638419646d628c5966ac94634701108edba17e20b0fb7df8aa6702550ad0b3537e0c7f3a06120468db48f058c489e1aeb8692fadc5d02b1e5bc46de63a76
 Size (ftplibpp-1.0.1.tar.gz) = 26688 bytes
 SHA1 (patch-aa) = d4b1d2a39fe2a157a671eeb012a2f5a6f77f39c0
+SHA1 (patch-ftplib.cpp) = df97c2155be65329d483294297d3ae668a12cdbb

Added files:

Index: pkgsrc/net/ftplibpp/patches/patch-ftplib.cpp
diff -u /dev/null pkgsrc/net/ftplibpp/patches/patch-ftplib.cpp:1.1
--- /dev/null   Thu Mar 26 02:30:27 2020
+++ pkgsrc/net/ftplibpp/patches/patch-ftplib.cpp        Thu Mar 26 02:30:27 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-ftplib.cpp,v 1.1 2020/03/26 02:30:27 joerg Exp $
+
+--- ftplib.cpp.orig    2020-03-25 15:24:48.938447059 +0000
++++ ftplib.cpp
+@@ -766,7 +766,7 @@ int ftplib::FtpOpenPort(netbuf *nControl
+     }
+ 
+       sin.in.sin_port = 0;
+-      if (bind(sData, &sin.sa, sizeof(sin)) == -1)
++      if (::bind(sData, &sin.sa, sizeof(sin)) == -1)
+       {
+           perror("bind");
+           net_close(sData);