Thu Sep 17 10:05:44 2020 UTC ()
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


(jperkin)
diff -r1.31 -r1.32 pkgsrc/net/libfilezilla/Makefile
diff -r1.10 -r1.11 pkgsrc/net/libfilezilla/PLIST
diff -r1.24 -r1.25 pkgsrc/net/libfilezilla/distinfo
diff -r0 -r1.1 pkgsrc/net/libfilezilla/patches/patch-lib_socket.cpp
diff -r0 -r1.6 pkgsrc/net/libfilezilla/patches/patch-lib_string.cpp

cvs diff -r1.31 -r1.32 pkgsrc/net/libfilezilla/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libfilezilla/Makefile 2020/06/10 15:13:50 1.31
+++ pkgsrc/net/libfilezilla/Makefile 2020/09/17 10:05:44 1.32
@@ -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
3DISTNAME= libfilezilla-0.22.0 3DISTNAME= libfilezilla-0.24.1
4CATEGORIES= net 4CATEGORIES= 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/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://lib.filezilla-project.org/ 10HOMEPAGE= https://lib.filezilla-project.org/
11COMMENT= Library for building high-performing, platform-independent programs 11COMMENT= Library for building high-performing, platform-independent programs
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake msgfmt pkg-config 16USE_TOOLS+= gmake msgfmt pkg-config

cvs diff -r1.10 -r1.11 pkgsrc/net/libfilezilla/PLIST (expand / switch to unified diff)

--- pkgsrc/net/libfilezilla/PLIST 2019/12/31 08:46:23 1.10
+++ pkgsrc/net/libfilezilla/PLIST 2020/09/17 10:05:44 1.11
@@ -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 $
2include/libfilezilla/apply.hpp 2include/libfilezilla/apply.hpp
3include/libfilezilla/buffer.hpp 3include/libfilezilla/buffer.hpp
4include/libfilezilla/encode.hpp 4include/libfilezilla/encode.hpp
5include/libfilezilla/encryption.hpp 5include/libfilezilla/encryption.hpp
6include/libfilezilla/event.hpp 6include/libfilezilla/event.hpp
7include/libfilezilla/event_handler.hpp 7include/libfilezilla/event_handler.hpp
8include/libfilezilla/event_loop.hpp 8include/libfilezilla/event_loop.hpp
9include/libfilezilla/file.hpp 9include/libfilezilla/file.hpp
10include/libfilezilla/format.hpp 10include/libfilezilla/format.hpp
11include/libfilezilla/glue/unix.hpp 11include/libfilezilla/glue/unix.hpp
12include/libfilezilla/glue/wx.hpp 12include/libfilezilla/glue/wx.hpp
13include/libfilezilla/hash.hpp 13include/libfilezilla/hash.hpp
14include/libfilezilla/iputils.hpp 14include/libfilezilla/iputils.hpp
15include/libfilezilla/libfilezilla.hpp 15include/libfilezilla/libfilezilla.hpp
16include/libfilezilla/local_filesys.hpp 16include/libfilezilla/local_filesys.hpp
17include/libfilezilla/logger.hpp 17include/libfilezilla/logger.hpp
18include/libfilezilla/mutex.hpp 18include/libfilezilla/mutex.hpp
19include/libfilezilla/optional.hpp 19include/libfilezilla/optional.hpp
20include/libfilezilla/private/defs.hpp 20include/libfilezilla/private/defs.hpp
21include/libfilezilla/private/visibility.hpp 21include/libfilezilla/private/visibility.hpp
22include/libfilezilla/private/windows.hpp 22include/libfilezilla/private/windows.hpp
23include/libfilezilla/process.hpp 23include/libfilezilla/process.hpp
24include/libfilezilla/rate_limited_layer.hpp 24include/libfilezilla/rate_limited_layer.hpp
25include/libfilezilla/rate_limiter.hpp 25include/libfilezilla/rate_limiter.hpp
26include/libfilezilla/recursive_remove.hpp 26include/libfilezilla/recursive_remove.hpp
 27include/libfilezilla/rwmutex.hpp
27include/libfilezilla/shared.hpp 28include/libfilezilla/shared.hpp
28include/libfilezilla/signature.hpp 29include/libfilezilla/signature.hpp
29include/libfilezilla/socket.hpp 30include/libfilezilla/socket.hpp
30include/libfilezilla/string.hpp 31include/libfilezilla/string.hpp
31include/libfilezilla/thread.hpp 32include/libfilezilla/thread.hpp
32include/libfilezilla/thread_pool.hpp 33include/libfilezilla/thread_pool.hpp
33include/libfilezilla/time.hpp 34include/libfilezilla/time.hpp
34include/libfilezilla/tls_info.hpp 35include/libfilezilla/tls_info.hpp
35include/libfilezilla/tls_layer.hpp 36include/libfilezilla/tls_layer.hpp
36include/libfilezilla/tls_system_trust_store.hpp 37include/libfilezilla/tls_system_trust_store.hpp
37include/libfilezilla/translate.hpp 38include/libfilezilla/translate.hpp
38include/libfilezilla/uri.hpp 39include/libfilezilla/uri.hpp
39include/libfilezilla/util.hpp 40include/libfilezilla/util.hpp

cvs diff -r1.24 -r1.25 pkgsrc/net/libfilezilla/distinfo (expand / switch to unified diff)

--- pkgsrc/net/libfilezilla/distinfo 2020/06/10 15:13:50 1.24
+++ pkgsrc/net/libfilezilla/distinfo 2020/09/17 10:05:44 1.25
@@ -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
3SHA1 (libfilezilla-0.22.0.tar.bz2) = e5dd681ec25641e4c00cccfe45fdb80ad970f5a9 3SHA1 (libfilezilla-0.24.1.tar.bz2) = 0cc47178917abc8e33b1c08bbe4f4d9a1de8180e
4RMD160 (libfilezilla-0.22.0.tar.bz2) = c8dba10cb670364777b29f797f9852f00708ffa6 4RMD160 (libfilezilla-0.24.1.tar.bz2) = e4439b7039f35536b447f523489a478f1ea34dde
5SHA512 (libfilezilla-0.22.0.tar.bz2) = 6ec53a4d82dc4c6650c560633c1f1cd50866fd954d5153be7e9ebea3ee0fa38d287e16dfdccb9ad22a7e7a325eec5d659bc51dd963b2deb540e8206e0f45513e 5SHA512 (libfilezilla-0.24.1.tar.bz2) = f9075bb88e5c10617d21fb7b49f7e9bd38567eeca3c4a1cd8b1e20354b1e3da95f05618897cefa6758c7843efd9833230843f77a0c23e7019cf22c950e7e8e8c
6Size (libfilezilla-0.22.0.tar.bz2) = 557320 bytes 6Size (libfilezilla-0.24.1.tar.bz2) = 560439 bytes
 7SHA1 (patch-lib_socket.cpp) = 3239e3a1563661fa4a9194e312b784dcd9ef5998
 8SHA1 (patch-lib_string.cpp) = 66f30d1e5220d955fd04588a4c7b94a5e5274439

File Added: pkgsrc/net/libfilezilla/patches/Attic/patch-lib_socket.cpp
$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

File Added: pkgsrc/net/libfilezilla/patches/Attic/patch-lib_string.cpp
$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();