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 failuresdiff -r1.31 -r1.32 pkgsrc/net/libfilezilla/Makefile
(jperkin)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.31 2020/06/10 15:13:50 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.32 2020/09/17 10:05:44 jperkin Exp $ | |
2 | 2 | |||
3 | DISTNAME= libfilezilla-0.22.0 | 3 | DISTNAME= libfilezilla-0.24.1 | |
4 | CATEGORIES= net | 4 | CATEGORIES= net | |
5 | # some kind of direct-download disabling | 5 | # some kind of direct-download disabling | |
6 | #MASTER_SITES= https://dl3.cdn.filezilla-project.org/libfilezilla/ | 6 | #MASTER_SITES= https://dl3.cdn.filezilla-project.org/libfilezilla/ | |
7 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://lib.filezilla-project.org/ | 10 | HOMEPAGE= https://lib.filezilla-project.org/ | |
11 | COMMENT= Library for building high-performing, platform-independent programs | 11 | COMMENT= Library for building high-performing, platform-independent programs | |
12 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
13 | 13 | |||
14 | GNU_CONFIGURE= yes | 14 | GNU_CONFIGURE= yes | |
15 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
16 | USE_TOOLS+= gmake msgfmt pkg-config | 16 | USE_TOOLS+= gmake msgfmt pkg-config |
@@ -1,39 +1,40 @@ | @@ -1,39 +1,40 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.10 2019/12/31 08:46:23 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.11 2020/09/17 10:05:44 jperkin Exp $ | |
2 | include/libfilezilla/apply.hpp | 2 | include/libfilezilla/apply.hpp | |
3 | include/libfilezilla/buffer.hpp | 3 | include/libfilezilla/buffer.hpp | |
4 | include/libfilezilla/encode.hpp | 4 | include/libfilezilla/encode.hpp | |
5 | include/libfilezilla/encryption.hpp | 5 | include/libfilezilla/encryption.hpp | |
6 | include/libfilezilla/event.hpp | 6 | include/libfilezilla/event.hpp | |
7 | include/libfilezilla/event_handler.hpp | 7 | include/libfilezilla/event_handler.hpp | |
8 | include/libfilezilla/event_loop.hpp | 8 | include/libfilezilla/event_loop.hpp | |
9 | include/libfilezilla/file.hpp | 9 | include/libfilezilla/file.hpp | |
10 | include/libfilezilla/format.hpp | 10 | include/libfilezilla/format.hpp | |
11 | include/libfilezilla/glue/unix.hpp | 11 | include/libfilezilla/glue/unix.hpp | |
12 | include/libfilezilla/glue/wx.hpp | 12 | include/libfilezilla/glue/wx.hpp | |
13 | include/libfilezilla/hash.hpp | 13 | include/libfilezilla/hash.hpp | |
14 | include/libfilezilla/iputils.hpp | 14 | include/libfilezilla/iputils.hpp | |
15 | include/libfilezilla/libfilezilla.hpp | 15 | include/libfilezilla/libfilezilla.hpp | |
16 | include/libfilezilla/local_filesys.hpp | 16 | include/libfilezilla/local_filesys.hpp | |
17 | include/libfilezilla/logger.hpp | 17 | include/libfilezilla/logger.hpp | |
18 | include/libfilezilla/mutex.hpp | 18 | include/libfilezilla/mutex.hpp | |
19 | include/libfilezilla/optional.hpp | 19 | include/libfilezilla/optional.hpp | |
20 | include/libfilezilla/private/defs.hpp | 20 | include/libfilezilla/private/defs.hpp | |
21 | include/libfilezilla/private/visibility.hpp | 21 | include/libfilezilla/private/visibility.hpp | |
22 | include/libfilezilla/private/windows.hpp | 22 | include/libfilezilla/private/windows.hpp | |
23 | include/libfilezilla/process.hpp | 23 | include/libfilezilla/process.hpp | |
24 | include/libfilezilla/rate_limited_layer.hpp | 24 | include/libfilezilla/rate_limited_layer.hpp | |
25 | include/libfilezilla/rate_limiter.hpp | 25 | include/libfilezilla/rate_limiter.hpp | |
26 | include/libfilezilla/recursive_remove.hpp | 26 | include/libfilezilla/recursive_remove.hpp | |
27 | include/libfilezilla/rwmutex.hpp | |||
27 | include/libfilezilla/shared.hpp | 28 | include/libfilezilla/shared.hpp | |
28 | include/libfilezilla/signature.hpp | 29 | include/libfilezilla/signature.hpp | |
29 | include/libfilezilla/socket.hpp | 30 | include/libfilezilla/socket.hpp | |
30 | include/libfilezilla/string.hpp | 31 | include/libfilezilla/string.hpp | |
31 | include/libfilezilla/thread.hpp | 32 | include/libfilezilla/thread.hpp | |
32 | include/libfilezilla/thread_pool.hpp | 33 | include/libfilezilla/thread_pool.hpp | |
33 | include/libfilezilla/time.hpp | 34 | include/libfilezilla/time.hpp | |
34 | include/libfilezilla/tls_info.hpp | 35 | include/libfilezilla/tls_info.hpp | |
35 | include/libfilezilla/tls_layer.hpp | 36 | include/libfilezilla/tls_layer.hpp | |
36 | include/libfilezilla/tls_system_trust_store.hpp | 37 | include/libfilezilla/tls_system_trust_store.hpp | |
37 | include/libfilezilla/translate.hpp | 38 | include/libfilezilla/translate.hpp | |
38 | include/libfilezilla/uri.hpp | 39 | include/libfilezilla/uri.hpp | |
39 | include/libfilezilla/util.hpp | 40 | include/libfilezilla/util.hpp |
@@ -1,6 +1,8 @@ | @@ -1,6 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.24 2020/06/10 15:13:50 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.25 2020/09/17 10:05:44 jperkin Exp $ | |
2 | 2 | |||
3 | SHA1 (libfilezilla-0.22.0.tar.bz2) = e5dd681ec25641e4c00cccfe45fdb80ad970f5a9 | 3 | SHA1 (libfilezilla-0.24.1.tar.bz2) = 0cc47178917abc8e33b1c08bbe4f4d9a1de8180e | |
4 | RMD160 (libfilezilla-0.22.0.tar.bz2) = c8dba10cb670364777b29f797f9852f00708ffa6 | 4 | RMD160 (libfilezilla-0.24.1.tar.bz2) = e4439b7039f35536b447f523489a478f1ea34dde | |
5 | SHA512 (libfilezilla-0.22.0.tar.bz2) = 6ec53a4d82dc4c6650c560633c1f1cd50866fd954d5153be7e9ebea3ee0fa38d287e16dfdccb9ad22a7e7a325eec5d659bc51dd963b2deb540e8206e0f45513e | 5 | SHA512 (libfilezilla-0.24.1.tar.bz2) = f9075bb88e5c10617d21fb7b49f7e9bd38567eeca3c4a1cd8b1e20354b1e3da95f05618897cefa6758c7843efd9833230843f77a0c23e7019cf22c950e7e8e8c | |
6 | Size (libfilezilla-0.22.0.tar.bz2) = 557320 bytes | 6 | Size (libfilezilla-0.24.1.tar.bz2) = 560439 bytes | |
7 | SHA1 (patch-lib_socket.cpp) = 3239e3a1563661fa4a9194e312b784dcd9ef5998 | |||
8 | SHA1 (patch-lib_string.cpp) = 66f30d1e5220d955fd04588a4c7b94a5e5274439 |
$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
$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();