CVS commit: pkgsrc/net/libfilezilla

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Sep 17 10:05:44 UTC 2020

Modified Files:
        pkgsrc/net/libfilezilla: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/libfilezilla/patches: patch-lib_socket.cpp
            patch-lib_string.cpp

Log Message:
libfilezilla: Update to 0.24.1.

While here fix the build on SunOS, based on patches in joyent/pkgsrc#266
from mrferda.

0.24.1 (2020-08-27)

- fz::to_integral can now handle strongly typed enum return types

0.24.0 (2020-08-21)

+ Added fz::equal_consttime
- fz::sprintf now works corrcetly if arguments are passed as (w)string_view

0.23.0 (2020-07-07)

+ Added reader/writer locks
- fz::mkdir can now return the the longest created path in case of partial failures


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/libfilezilla/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/libfilezilla/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/libfilezilla/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/libfilezilla/patches/patch-lib_socket.cpp
cvs rdiff -u -r0 -r1.6 pkgsrc/net/libfilezilla/patches/patch-lib_string.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/libfilezilla/Makefile
diff -u pkgsrc/net/libfilezilla/Makefile:1.31 pkgsrc/net/libfilezilla/Makefile:1.32
--- pkgsrc/net/libfilezilla/Makefile:1.31       Wed Jun 10 15:13:50 2020
+++ pkgsrc/net/libfilezilla/Makefile    Thu Sep 17 10:05:44 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2020/06/10 15:13:50 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2020/09/17 10:05:44 jperkin Exp $
 
-DISTNAME=      libfilezilla-0.22.0
+DISTNAME=      libfilezilla-0.24.1
 CATEGORIES=    net
 # some kind of direct-download disabling
 #MASTER_SITES= https://dl3.cdn.filezilla-project.org/libfilezilla/

Index: pkgsrc/net/libfilezilla/PLIST
diff -u pkgsrc/net/libfilezilla/PLIST:1.10 pkgsrc/net/libfilezilla/PLIST:1.11
--- pkgsrc/net/libfilezilla/PLIST:1.10  Tue Dec 31 08:46:23 2019
+++ pkgsrc/net/libfilezilla/PLIST       Thu Sep 17 10:05:44 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2019/12/31 08:46:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2020/09/17 10:05:44 jperkin Exp $
 include/libfilezilla/apply.hpp
 include/libfilezilla/buffer.hpp
 include/libfilezilla/encode.hpp
@@ -24,6 +24,7 @@ include/libfilezilla/process.hpp
 include/libfilezilla/rate_limited_layer.hpp
 include/libfilezilla/rate_limiter.hpp
 include/libfilezilla/recursive_remove.hpp
+include/libfilezilla/rwmutex.hpp
 include/libfilezilla/shared.hpp
 include/libfilezilla/signature.hpp
 include/libfilezilla/socket.hpp

Index: pkgsrc/net/libfilezilla/distinfo
diff -u pkgsrc/net/libfilezilla/distinfo:1.24 pkgsrc/net/libfilezilla/distinfo:1.25
--- pkgsrc/net/libfilezilla/distinfo:1.24       Wed Jun 10 15:13:50 2020
+++ pkgsrc/net/libfilezilla/distinfo    Thu Sep 17 10:05:44 2020
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.24 2020/06/10 15:13:50 wiz Exp $
+$NetBSD: distinfo,v 1.25 2020/09/17 10:05:44 jperkin Exp $
 
-SHA1 (libfilezilla-0.22.0.tar.bz2) = e5dd681ec25641e4c00cccfe45fdb80ad970f5a9
-RMD160 (libfilezilla-0.22.0.tar.bz2) = c8dba10cb670364777b29f797f9852f00708ffa6
-SHA512 (libfilezilla-0.22.0.tar.bz2) = 6ec53a4d82dc4c6650c560633c1f1cd50866fd954d5153be7e9ebea3ee0fa38d287e16dfdccb9ad22a7e7a325eec5d659bc51dd963b2deb540e8206e0f45513e
-Size (libfilezilla-0.22.0.tar.bz2) = 557320 bytes
+SHA1 (libfilezilla-0.24.1.tar.bz2) = 0cc47178917abc8e33b1c08bbe4f4d9a1de8180e
+RMD160 (libfilezilla-0.24.1.tar.bz2) = e4439b7039f35536b447f523489a478f1ea34dde
+SHA512 (libfilezilla-0.24.1.tar.bz2) = f9075bb88e5c10617d21fb7b49f7e9bd38567eeca3c4a1cd8b1e20354b1e3da95f05618897cefa6758c7843efd9833230843f77a0c23e7019cf22c950e7e8e8c
+Size (libfilezilla-0.24.1.tar.bz2) = 560439 bytes
+SHA1 (patch-lib_socket.cpp) = 3239e3a1563661fa4a9194e312b784dcd9ef5998
+SHA1 (patch-lib_string.cpp) = 66f30d1e5220d955fd04588a4c7b94a5e5274439

Added files:

Index: pkgsrc/net/libfilezilla/patches/patch-lib_socket.cpp
diff -u /dev/null pkgsrc/net/libfilezilla/patches/patch-lib_socket.cpp:1.1
--- /dev/null   Thu Sep 17 10:05:44 2020
+++ pkgsrc/net/libfilezilla/patches/patch-lib_socket.cpp        Thu Sep 17 10:05:44 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_socket.cpp,v 1.1 2020/09/17 10:05:44 jperkin Exp $
+
+Spell struct correctly.
+
+--- lib/socket.cpp.orig        2020-08-21 13:35:14.000000000 +0000
++++ lib/socket.cpp
+@@ -1678,8 +1678,8 @@ int socket::write(void const* buffer, un
+ 
+ #if !defined(SO_NOSIGPIPE) && !defined(FZ_WINDOWS)
+       // Some systems have neither. Need to block signal
+-      sigaction old_action;
+-      sigaction action = {};
++      struct sigaction old_action;
++      struct sigaction action = {};
+       action.sa_handler = SIG_IGN;
+       int signal_set = sigaction(SIGPIPE, &action, &old_action);
+ #endif

Index: pkgsrc/net/libfilezilla/patches/patch-lib_string.cpp
diff -u /dev/null pkgsrc/net/libfilezilla/patches/patch-lib_string.cpp:1.6
--- /dev/null   Thu Sep 17 10:05:44 2020
+++ pkgsrc/net/libfilezilla/patches/patch-lib_string.cpp        Thu Sep 17 10:05:44 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_string.cpp,v 1.6 2020/09/17 10:05:44 jperkin Exp $
+
+Explicitly use std::wcsnrtombs.
+
+--- lib/string.cpp.orig        2020-07-07 12:06:31.000000000 +0000
++++ lib/string.cpp
+@@ -354,7 +354,7 @@ std::string to_string(std::wstring_view
+ 
+                       std::mbstate_t ps{};
+                       wchar_t const* in_p = in.data() + start;
+-                      size_t len = wcsnrtombs(nullptr, &in_p, inlen, 0, &ps);
++                      size_t len = std::wcsnrtombs(nullptr, &in_p, inlen, 0, &ps);
+                       if (len != static_cast<size_t>(-1)) {
+                               size_t old = ret.size();
+                               if (start) {
+@@ -364,7 +364,7 @@ std::string to_string(std::wstring_view
+                               char* out_p = &ret[old];
+ 
+                               in_p = in.data() + start; // Some implementations of wcsrtombs change src even on null dst
+-                              wcsnrtombs(out_p, &in_p, inlen, len, &ps);
++                              std::wcsnrtombs(out_p, &in_p, inlen, len, &ps);
+                       }
+                       else {
+                               ret.clear();